X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=090c9135390898c51170f696750911139ebb94d3;hp=cee557dd12f22ecf24312fd3eaa1b5fc2dcb4f05;hb=e5c944e193f275241f3c709d952387db9073f279;hpb=e83ad1be25aefea3ed21ec08edbaf2d5a72c4a9d diff --git a/main.c b/main.c index cee557d..090c913 100644 --- a/main.c +++ b/main.c @@ -52,6 +52,28 @@ #include "nntp/nntp.h" #endif +#ifdef USE_LIBESMTP +#include +#endif + +#if USE_HCACHE +#if HAVE_QDBM +#include +#elif HAVE_GDBM +#include +#elif HAVE_DB4 +#include +#endif +#endif + +#ifdef USE_GNUTLS +#include +#endif + +#ifdef CRYPT_BACKEND_GPGME +#include +#endif + static const char *ReachingUs = N_("\ To contact the developers, please mail to .\n\ To visit the Mutt-ng homepage go to http://www.muttng.org.\n\ @@ -103,14 +125,15 @@ void mutt_exit (int code) static void mutt_usage (void) { - puts (mutt_make_version ()); + puts (mutt_make_version (1)); puts _ ("usage: muttng [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f ]\n\ muttng [ -nR ] [ -e ] [ -F ] -Q [ -Q ] [...]\n\ muttng [ -nR ] [ -e ] [ -F ] -A [ -A ] [...]\n\ - muttng [ -nR ] [ -e ] [ -F ] -D\n\ + muttng [ -nR ] [ -e ] [ -F ] -t\n\ + muttng [ -nR ] [ -e ] [ -F ] -T\n\ muttng [ -nx ] [ -e ] [ -a ] [ -F ] [ -H ] [ -i ] [ -s ] [ -b ] [ -c ] [ ... ]\n\ muttng [ -n ] [ -e ] [ -F ] -p\n\ muttng -v[v]\n\ @@ -119,21 +142,27 @@ options:\n\ -A \texpand the given alias\n\ -a \tattach a file to the message\n\ -b
\tspecify a blind carbon-copy (BCC) address\n\ - -c
\tspecify a carbon-copy (CC) address\n\ - -D\t\tprint the value of all variables to stdout\n\ + -c
\tspecify a carbon-copy (CC) address"); +#if DEBUG + puts _(" -d \tlog debugging output to ~/.muttngdebug0"); +#endif + puts _("\ -e \tspecify a command to be executed after initialization\n\ -f \tspecify which mailbox to read\n\ - -F \tspecify an alternate muttrc file\n\ + -F \tspecify an alternate muttrngc file\n\ -g \tspecify a newsserver (if compiled with NNTP)\n\ -G\t\tselect a newsgroup (if compiled with NNTP)\n\ -H \tspecify a draft file to read header and body from\n\ -i \tspecify a file which Mutt-ng should include in the body\n\ + -d \t specify debugging level of Mutt-ng\n\ -m \tspecify a default mailbox type\n\ -n\t\tcauses Mutt-ng not to read the system Muttngrc\n\ -p\t\trecall a postponed message\n\ -Q \tquery a configuration variable\n\ -R\t\topen mailbox in read-only mode\n\ -s \tspecify a subject (must be in quotes if it has spaces)\n\ + -t\t\tprint the value of all variables to stdout\n\ + -T\t\tprint the value of all changed variables to stdout\n\ -v\t\tshow version and compile-time definitions\n\ -x\t\tsimulate the mailx send mode\n\ -y\t\tselect a mailbox specified in your `mailboxes' list\n\ @@ -147,59 +176,78 @@ options:\n\ static void show_version (void) { struct utsname uts; +#ifdef USE_LIBESMTP + char buf[STRING]; +#endif - puts (mutt_make_version ()); + puts (mutt_make_version (1)); puts (_(Notice)); uname (&uts); #ifdef _AIX - printf ("System: %s %s.%s", uts.sysname, uts.version, uts.release); + printf ("System:\n %s %s.%s", uts.sysname, uts.version, uts.release); #elif defined (SCO) - printf ("System: SCO %s", uts.release); + printf ("System:\n SCO %s", uts.release); #else - printf ("System: %s %s", uts.sysname, uts.release); + printf ("System:\n %s %s", uts.sysname, uts.release); #endif - printf (" (%s)", uts.machine); + printf (" (%s)\nExternal Libraries:\n", uts.machine); #ifdef NCURSES_VERSION - printf (" [using ncurses %s]", NCURSES_VERSION); + printf (" ncurses %s\n", NCURSES_VERSION); #elif defined(USE_SLANG_CURSES) - printf (" [using slang %d]", SLANG_VERSION); + printf (" slang %d\n", SLANG_VERSION); #endif #ifdef _LIBICONV_VERSION - printf (" [using libiconv %d.%d]", _LIBICONV_VERSION >> 8, + printf (" libiconv %d.%d\n", _LIBICONV_VERSION >> 8, _LIBICONV_VERSION & 0xff); #endif #ifdef HAVE_LIBIDN - printf (" [using libidn %s (compiled with %s)]", + printf (" libidn %s (compiled with %s)\n", stringprep_check_version (NULL), STRINGPREP_VERSION); #endif - puts (_("\nCompile options:")); +#ifdef USE_LIBESMTP + smtp_version (buf, sizeof (buf), 0); + printf (" libESMTP %s\n", buf); +#endif -#ifdef DOMAIN - printf ("DOMAIN=\"%s\"\n", DOMAIN); -#else - puts ("-DOMAIN"); +#if USE_HCACHE +#if HAVE_QDBM + printf (" qdbm %s\n", dpversion); +#elif HAVE_GDBM + printf (" gdbm %s\n", gdbm_version); +#elif HAVE_DB4 + printf (" DB4 %d.%d.%d\n", DB_VERSION_MAJOR, DB_VERSION_MINOR, + DB_VERSION_PATCH); +#endif #endif -#ifdef DEBUG - puts ("+DEBUG"); -#else - puts ("-DEBUG"); +#ifdef USE_GNUTLS + printf (" gnutls %s\n", LIBGNUTLS_VERSION); #endif +#ifdef CRYPT_BACKEND_GPGME + printf (" gpgme %s\n", GPGME_VERSION); +#endif + + puts (_("Compile Options:")); +#ifdef DEBUG + puts (" +DEBUG"); +#else + puts (" -DEBUG"); +#endif puts ( #ifdef HOMESPOOL - "+HOMESPOOL " + " +HOMESPOOL " #else - "-HOMESPOOL " + " -HOMESPOOL " #endif #ifdef USE_SETGID "+USE_SETGID " @@ -216,7 +264,7 @@ static void show_version (void) #else "-DL_STANDALONE " #endif - "\n" + "\n " #ifdef USE_FCNTL "+USE_FCNTL " #else @@ -240,9 +288,9 @@ static void show_version (void) ); puts ( #ifdef USE_POP - "+USE_POP " + " +USE_POP " #else - "-USE_POP " + " -USE_POP " #endif #ifdef USE_NNTP "+USE_NNTP " @@ -284,7 +332,7 @@ static void show_version (void) #else "-USE_LIBESMTP " #endif - "\n" + "\n " #ifdef HAVE_REGCOMP "+HAVE_REGCOMP " #else @@ -300,7 +348,7 @@ static void show_version (void) #else "-COMPRESSED " #endif - "\n" + "\n " #ifdef HAVE_COLOR "+HAVE_COLOR " #else @@ -321,7 +369,7 @@ static void show_version (void) #else "-HAVE_BKGDSET " #endif - "\n" + "\n " #ifdef HAVE_CURS_SET "+HAVE_CURS_SET " #else @@ -341,9 +389,9 @@ static void show_version (void) puts ( #ifdef CRYPT_BACKEND_CLASSIC_PGP - "+CRYPT_BACKEND_CLASSIC_PGP " + " +CRYPT_BACKEND_CLASSIC_PGP " #else - "-CRYPT_BACKEND_CLASSIC_PGP " + " -CRYPT_BACKEND_CLASSIC_PGP " #endif #ifdef CRYPT_BACKEND_CLASSIC_SMIME "+CRYPT_BACKEND_CLASSIC_SMIME " @@ -365,7 +413,7 @@ static void show_version (void) #else "-SUN_ATTACHMENT " #endif - "\n" + "\n " #ifdef ENABLE_NLS "+ENABLE_NLS " #else @@ -391,7 +439,7 @@ static void show_version (void) #else "-HAVE_LANGINFO_YESEXPR " #endif - "\n" + "\n " #if HAVE_ICONV "+HAVE_ICONV " #else @@ -419,21 +467,29 @@ static void show_version (void) #endif ); + puts (_("Built-In Defaults:")); + +#ifdef DOMAIN + printf (" +DOMAIN=\"%s\"\n", DOMAIN); +#else + puts (" -DOMAIN"); +#endif + #ifdef ISPELL - printf ("ISPELL=\"%s\"\n", ISPELL); + printf (" +ISPELL=\"%s\"\n", ISPELL); #else - puts ("-ISPELL"); + puts (" -ISPELL"); #endif - printf ("SENDMAIL=\"%s\"\n", SENDMAIL); - printf ("MAILPATH=\"%s\"\n", MAILPATH); - printf ("PKGDATADIR=\"%s\"\n", PKGDATADIR); - printf ("SYSCONFDIR=\"%s\"\n", SYSCONFDIR); - printf ("EXECSHELL=\"%s\"\n", EXECSHELL); + printf (" +SENDMAIL=\"%s\"\n", SENDMAIL); + printf (" +MAILPATH=\"%s\"\n", MAILPATH); + printf (" +PKGDATADIR=\"%s\"\n", PKGDATADIR); + printf (" +SYSCONFDIR=\"%s\"\n", SYSCONFDIR); + printf (" +EXECSHELL=\"%s\"\n", EXECSHELL); #ifdef MIXMASTER - printf ("MIXMASTER=\"%s\"\n", MIXMASTER); + printf (" +MIXMASTER=\"%s\"\n\n", MIXMASTER); #else - puts ("-MIXMASTER"); + puts (" -MIXMASTER\n"); #endif puts (_(ReachingUs)); @@ -504,7 +560,7 @@ int main (int argc, char **argv) int version = 0; int i; int explicit_folder = 0; - int dump_variables = 0; + int dump_variables = -1; extern char *optarg; extern int optind; @@ -538,10 +594,10 @@ int main (int argc, char **argv) #ifdef USE_NNTP while ((i = getopt (argc, argv, - "A:a:b:F:f:c:Dd:e:g:GH:s:i:hm:npQ:RvxyzZ")) != EOF) + "A:a:b:F:f:c:d:e:g:GH:s:i:hm:npQ:RTtvxyzZ")) != EOF) #else while ((i = - getopt (argc, argv, "A:a:b:F:f:c:Dd:e:H:s:i:hm:npQ:RvxyzZ")) != EOF) + getopt (argc, argv, "A:a:b:F:f:c:d:e:H:s:i:hm:npQ:RTtvxyzZ")) != EOF) #endif switch (i) { case 'A': @@ -579,14 +635,16 @@ int main (int argc, char **argv) case 'd': debug_setlevel(atoi(optarg)); -#ifdef DEBUG - printf (_("Debugging at level %d.\n"), atoi(optarg)); -#else +#ifndef DEBUG printf _("DEBUG was not defined during compilation. Ignored.\n"); #endif break; - case 'D': + case 't': + dump_variables = 2; + break; + + case 'T': dump_variables = 1; break; @@ -672,14 +730,14 @@ int main (int argc, char **argv) show_version (); break; default: - puts (mutt_make_version ()); + puts (mutt_make_version (1)); puts (_(Copyright)); puts (_(ReachingUs)); exit (0); } /* Check for a batch send. */ - if (!isatty (0) || queries || alias_queries || dump_variables) { + if (!isatty (0) || queries || alias_queries || dump_variables > 0) { set_option (OPTNOCURSES); sendflags = SENDBATCH; } @@ -699,8 +757,8 @@ int main (int argc, char **argv) if (queries) return mutt_query_variables (queries); - if (dump_variables) - return (mutt_dump_variables ()); + if (dump_variables > 0) + return (mutt_dump_variables (dump_variables-1)); if (alias_queries) { int rv = 0; @@ -792,7 +850,7 @@ int main (int argc, char **argv) } if (subject) - msg->env->subject = safe_strdup (subject); + msg->env->subject = str_dup (subject); if (includeFile) infile = includeFile; @@ -800,7 +858,7 @@ int main (int argc, char **argv) if (infile || bodytext) { if (infile) { - if (mutt_strcmp ("-", infile) == 0) + if (str_cmp ("-", infile) == 0) fin = stdin; else { char path[_POSIX_PATH_MAX]; @@ -819,7 +877,7 @@ int main (int argc, char **argv) fin = NULL; mutt_mktemp (buf); - tempfile = safe_strdup (buf); + tempfile = str_dup (buf); if (draftFile) msg->env = mutt_read_rfc822_header (fin, NULL, 1, 0); @@ -834,7 +892,7 @@ int main (int argc, char **argv) mutt_endwin (NULL); perror (tempfile); fclose (fin); - FREE (&tempfile); + mem_free (&tempfile); exit (1); } if (fin) @@ -847,7 +905,7 @@ int main (int argc, char **argv) } } - FREE (&bodytext); + mem_free (&bodytext); if (attach) { LIST *t = attach; @@ -949,7 +1007,7 @@ int main (int argc, char **argv) if (option (OPTXTERMSETTITLES)) mutt_xterm_set_title (NONULL (XtermLeave)); if (Context) - FREE (&Context); + mem_free (&Context); } mutt_endwin (Errorbuf); }