X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=b8a5a1159a6a19a35c7e4920f8e6b43126187abd;hp=1fa246e55727c9e5f8e9e34a7f6055fc0e1de810;hb=e83dbdbc6200a71981d06773869cd0492f81f16c;hpb=82d5d8ffc8cd4cf837736187eba9ddfd8b2e2f7f diff --git a/main.c b/main.c index 1fa246e..b8a5a11 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,7 +125,7 @@ void mutt_exit (int code) static void mutt_usage (void) { - puts (mutt_make_version ()); + puts (mutt_make_version (1)); puts _ @@ -120,10 +142,14 @@ options:\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\ + -D\t\tprint the value of all variables to stdout"); +#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\ @@ -148,59 +174,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 + +#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 DOMAIN - printf ("DOMAIN=\"%s\"\n", DOMAIN); -#else - puts ("-DOMAIN"); +#ifdef USE_GNUTLS + printf (" gnutls %s\n", LIBGNUTLS_VERSION); #endif -#ifdef DEBUG - puts ("+DEBUG"); -#else - puts ("-DEBUG"); +#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 " @@ -217,7 +262,7 @@ static void show_version (void) #else "-DL_STANDALONE " #endif - "\n" + "\n " #ifdef USE_FCNTL "+USE_FCNTL " #else @@ -241,9 +286,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 " @@ -285,7 +330,7 @@ static void show_version (void) #else "-USE_LIBESMTP " #endif - "\n" + "\n " #ifdef HAVE_REGCOMP "+HAVE_REGCOMP " #else @@ -301,7 +346,7 @@ static void show_version (void) #else "-COMPRESSED " #endif - "\n" + "\n " #ifdef HAVE_COLOR "+HAVE_COLOR " #else @@ -322,7 +367,7 @@ static void show_version (void) #else "-HAVE_BKGDSET " #endif - "\n" + "\n " #ifdef HAVE_CURS_SET "+HAVE_CURS_SET " #else @@ -342,9 +387,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 " @@ -366,7 +411,7 @@ static void show_version (void) #else "-SUN_ATTACHMENT " #endif - "\n" + "\n " #ifdef ENABLE_NLS "+ENABLE_NLS " #else @@ -392,7 +437,7 @@ static void show_version (void) #else "-HAVE_LANGINFO_YESEXPR " #endif - "\n" + "\n " #if HAVE_ICONV "+HAVE_ICONV " #else @@ -420,21 +465,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)); @@ -581,10 +634,11 @@ int main (int argc, char **argv) case 'd': debug_setlevel(atoi(optarg)); #ifdef DEBUG - if (atoi(optarg)<=3 && atoi(optoarg)>=0) + if (atoi(optarg) <= DEBUG_MAX_LEVEL && atoi(optarg) >= DEBUG_MIN_LEVEL) printf (_("Debugging at level %d.\n"), atoi(optarg)); else { - printf(_("Please specify a valid debugging level (0-3)\n")) + printf(_("Please specify a valid debugging level (" + DEBUG_MIN_LEVEL_S "-" DEBUG_MAX_LEVEL_S ").\n")); return 1; } #else @@ -678,7 +732,7 @@ 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); @@ -798,7 +852,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; @@ -806,7 +860,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]; @@ -825,7 +879,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); @@ -840,7 +894,7 @@ int main (int argc, char **argv) mutt_endwin (NULL); perror (tempfile); fclose (fin); - FREE (&tempfile); + mem_free (&tempfile); exit (1); } if (fin) @@ -853,7 +907,7 @@ int main (int argc, char **argv) } } - FREE (&bodytext); + mem_free (&bodytext); if (attach) { LIST *t = attach; @@ -955,7 +1009,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); }