X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=ab893ca43e2bb20f23d84ce67646c2a7f4cb9650;hp=9cf043719b67b9c780466100e789bc1162dfd697;hb=48a027c4e8a676bc53de48f88b09d34347c23f28;hpb=ab08a35e6e38e50a8d525209db872ade970ae5be

diff --git a/main.c b/main.c
index 9cf0437..ab893ca 100644
--- a/main.c
+++ b/main.c
@@ -19,32 +19,32 @@
 # include "config.h"
 #endif
 
+#include <string.h>
+#include <stdlib.h>
+#include <locale.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <sys/utsname.h>
+
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
+#include <lib-lib/debug.h>
+
+#include <lib-ui/curses.h>
 
 #include "mutt.h"
 #include "mx.h"
 #include "buffy.h"
 #include "sort.h"
 #include <lib-crypt/crypt.h>
-#include "mutt_curses.h"
 #include "keymap.h"
 #include "url.h"
 #include "mutt_idna.h"
 #include "xterm.h"
 
-#include "lib/debug.h"
-
-#include <string.h>
-#include <stdlib.h>
-#include <locale.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/utsname.h>
-
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #else
@@ -86,16 +86,11 @@ extern int optind;
 #include <openssl/opensslv.h>
 #endif
 
-static const char *ReachingUs = N_("\
-To contact the developers, please mail to <mutt-ng-devel@lists.berlios.de>.\n\
-To visit the Mutt-ng homepage go to http://www.muttng.org.\n\
-To report a bug, please use the fleang(1) utility.\n");
-
 static const char *Notice = N_("\
 Copyright (C) 1996-2002 Michael R. Elkins and others.\n\
-Mutt-ng comes with ABSOLUTELY NO WARRANTY; for details type `muttng -vv'.\n\
+Madmutt comes with ABSOLUTELY NO WARRANTY; for details type `madmutt -vv'.\n\
 Mutt is free software, and you are welcome to redistribute it\n\
-under certain conditions; type `muttng -vv' for details.\n");
+under certain conditions; type `madmutt -vv' for details.\n");
 
 static const char *Copyright_Mutt = N_("\
 Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n\
@@ -146,16 +141,16 @@ static void mutt_usage (void)
   puts (mutt_make_version (1));
 
   puts
-    _("usage: muttng [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f <file> ]\n\
-       muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] [...]\n\
-       muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] [...]\n\
-       muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -t");
+    _("usage: madmutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f <file> ]\n\
+       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] [...]\n\
+       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] [...]\n\
+       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -t");
   puts
     _("\
-       muttng [ -nR ] [ -e <cmd> ] [ -F <file> ] -T\n\
-       muttng [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] [ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n\
-       muttng [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n\
-       muttng -v[v]\n\
+       madmutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -T\n\
+       madmutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H <file> ] [ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n\
+       madmutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n\
+       madmutt -v[v]\n\
 \n\
 options:\n\
   -A <alias>\texpand the given alias\n\
@@ -163,7 +158,7 @@ options:\n\
   -b <address>\tspecify a blind carbon-copy (BCC) address\n\
   -c <address>\tspecify a carbon-copy (CC) address");
 #if DEBUG
-  puts _("  -d <level>\tlog debugging output to ~/.muttngdebug0");
+  puts _("  -d <level>\tlog debugging output to ~/.madmuttdebug0");
 #endif
   puts _("\
   -e <command>\tspecify a command to be executed after initialization\n\
@@ -172,11 +167,11 @@ options:\n\
   -g <server>\tspecify a newsserver (if compiled with NNTP)\n\
   -G\t\tselect a newsgroup (if compiled with NNTP)\n\
   -H <file>\tspecify a draft file to read header and body from\n\
-  -i <file>\tspecify a file which Mutt-ng should include in the body");
+  -i <file>\tspecify a file which Madmutt should include in the body");
   puts _("\
-  -d <level>\t specify debugging level of Mutt-ng\n\
+  -d <level>\t specify debugging level of Madmutt\n\
   -m <type>\tspecify a default mailbox type\n\
-  -n\t\tcauses Mutt-ng not to read the system Muttngrc\n\
+  -n\t\tcauses Madmutt not to read the system Madmuttrc\n\
   -p\t\trecall a postponed message\n\
   -Q <variable>\tquery a configuration variable\n\
   -R\t\topen mailbox in read-only mode\n\
@@ -335,11 +330,6 @@ static void show_version (void)
          "+HAVE_REGCOMP  "
 #else
          "-HAVE_REGCOMP  "
-#endif
-#ifdef USE_GNU_REGEX
-         "+USE_GNU_REGEX  "
-#else
-         "-USE_GNU_REGEX  "
 #endif
          "\n  "
 #ifdef HAVE_COLOR
@@ -459,9 +449,7 @@ static void show_version (void)
   puts ("  -MIXMASTER\n");
 #endif
 
-  puts (_(ReachingUs));
-
-  puts (_("MadMutt is based on Mutt-ng wich was based on Mutt before\n"));
+  puts (_("MadMutt is based on Madmutt wich was based on Mutt before\n"));
 
   exit (0);
 }
@@ -552,8 +540,8 @@ int main (int argc, char **argv)
   SRAND (time (NULL));
   umask (077);
 
-  p_clear(Options, sizeof(Options));
-  p_clear(QuadOptions, sizeof(QuadOptions));
+  p_clear(Options, countof(Options));
+  p_clear(QuadOptions, countof(QuadOptions));
 
 #ifdef USE_NNTP
   while ((i =
@@ -700,7 +688,6 @@ int main (int argc, char **argv)
     puts (_(Copyright_GPL_1));
     puts (_(Copyright_GPL_2));
     puts (_(Copyright_GPL_3));
-    puts (_(ReachingUs));
     exit (0);
   }