X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=b8a5a1159a6a19a35c7e4920f8e6b43126187abd;hp=95c3ddf6a09085232c224fde0ccdbfc661fd82f8;hb=e83dbdbc6200a71981d06773869cd0492f81f16c;hpb=74a2265af51ce89bca845adc1d68f273c9933c13 diff --git a/main.c b/main.c index 95c3ddf..b8a5a11 100644 --- a/main.c +++ b/main.c @@ -22,14 +22,15 @@ #include "mutt.h" #include "mutt_curses.h" #include "keymap.h" -#include "mailbox.h" #include "url.h" #include "mutt_crypt.h" #include "mutt_idna.h" +#include "xterm.h" #include "lib/mem.h" #include "lib/intl.h" #include "lib/str.h" +#include "lib/debug.h" #include #include @@ -48,7 +49,29 @@ #endif #ifdef USE_NNTP -#include +#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_("\ @@ -63,17 +86,18 @@ Mutt is free software, and you are welcome to redistribute it\n\ under certain conditions; type `muttng -vv' for details.\n"); static const char *Copyright = N_("\ -Copyright (C) 1996-2002 Michael R. Elkins \n\ +Copyright (C) 1996-2004 Michael R. Elkins \n\ Copyright (C) 1996-2002 Brandon Long \n\ -Copyright (C) 1997-2002 Thomas Roessler \n\ -Copyright (C) 1998-2002 Werner Koch \n\ -Copyright (C) 1999-2002 Brendan Cully \n\ +Copyright (C) 1997-2005 Thomas Roessler \n\ +Copyright (C) 1998-2005 Werner Koch \n\ +Copyright (C) 1999-2005 Brendan Cully \n\ Copyright (C) 1999-2002 Tommi Komulainen \n\ Copyright (C) 2000-2002 Edmund Grimley Evans \n\n\ -Parts were written/modified by:\n\ -Andreas Krennmair \n\ -Nico Golde \n\ -Rocco Rutte \n\ +Copyright (C) 2005:\n\ + Parts were written/modified by:\n\ + Andreas Krennmair \n\ + Nico Golde \n\ + Rocco Rutte \n\ \n\ Lots of others not mentioned here contributed lots of code,\n\ fixes, and suggestions.\n\ @@ -101,13 +125,14 @@ 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 [ -nx ] [ -e ] [ -a ] [ -F ] [ -H ] [ -i ] [ -s ] [ -b ] [ -c ] [ ... ]\n\ muttng [ -n ] [ -e ] [ -F ] -p\n\ muttng -v[v]\n\ @@ -117,13 +142,19 @@ 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"); +#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\ @@ -143,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 -#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 " @@ -212,7 +262,7 @@ static void show_version (void) #else "-DL_STANDALONE " #endif - "\n" + "\n " #ifdef USE_FCNTL "+USE_FCNTL " #else @@ -227,13 +277,18 @@ static void show_version (void) "+USE_INODESORT " #else "-USE_INODESORT " +#endif +#if USE_HCACHE + "+USE_HCACHE " +#else + "-USE_HCACHE " #endif ); puts ( #ifdef USE_POP - "+USE_POP " + " +USE_POP " #else - "-USE_POP " + " -USE_POP " #endif #ifdef USE_NNTP "+USE_NNTP " @@ -245,11 +300,6 @@ static void show_version (void) #else "-USE_IMAP " #endif -#ifdef IMAP_EDIT_THREADS - "+IMAP_EDIT_THREADS " -#else - "-IMAP_EDIT_THREADS " -#endif #ifdef USE_GSS "+USE_GSS " #else @@ -265,11 +315,6 @@ static void show_version (void) #else "-USE_GNUTLS " #endif -#ifdef USE_GNUTLS - "+USE_GNUTLS " -#else - "-USE_GNUTLS " -#endif #ifdef USE_SASL "+USE_SASL " #else @@ -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 " @@ -361,17 +406,12 @@ static void show_version (void) #else "-BUFFY_SIZE " #endif -#ifdef EXACT_ADDRESS - "+EXACT_ADDRESS " -#else - "-EXACT_ADDRESS " -#endif #ifdef SUN_ATTACHMENT "+SUN_ATTACHMENT " #else "-SUN_ATTACHMENT " #endif - "\n" + "\n " #ifdef ENABLE_NLS "+ENABLE_NLS " #else @@ -397,7 +437,7 @@ static void show_version (void) #else "-HAVE_LANGINFO_YESEXPR " #endif - "\n" + "\n " #if HAVE_ICONV "+HAVE_ICONV " #else @@ -423,37 +463,36 @@ static void show_version (void) #else "-HAVE_GETADDRINFO " #endif -#if USE_HCACHE - "+USE_HCACHE " -#else - "-USE_HCACHE " -#endif -#if USE_HCACHE - "+USE_HCACHE " + ); + + puts (_("Built-In Defaults:")); + +#ifdef DOMAIN + printf (" +DOMAIN=\"%s\"\n", DOMAIN); #else - "-USE_HCACHE " + 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)); + puts (_("Mutt-ng is based on the following patches written for mutt:\n")); mutt_print_patchlist (); exit (0); @@ -519,11 +558,15 @@ int main (int argc, char **argv) int version = 0; int i; int explicit_folder = 0; + int dump_variables = 0; extern char *optarg; extern int optind; + /* initialize random number for tmp file creation */ + srand ((unsigned int) time (NULL)); + /* sanity check against stupid administrators */ - + if (getegid () != getgid ()) { fprintf (stderr, "%s: I don't want to run with privileges!\n", argv[0]); exit (1); @@ -549,10 +592,10 @@ int main (int argc, char **argv) #ifdef USE_NNTP while ((i = getopt (argc, argv, - "A:a:b:F:f:c:d:e:g:GH:s:i:hm:npQ:RvxyzZ")) != EOF) + "A:a:b:F:f:c:Dd:e:g:GH:s:i:hm:npQ:RvxyzZ")) != EOF) #else while ((i = - getopt (argc, argv, "A:a:b:F:f:c:d:e:H:s:i:hm:npQ:RvxyzZ")) != EOF) + getopt (argc, argv, "A:a:b:F:f:c:Dd:e:H:s:i:hm:npQ:RvxyzZ")) != EOF) #endif switch (i) { case 'A': @@ -568,7 +611,7 @@ int main (int argc, char **argv) break; case 'F': - mutt_str_replace (&Muttrc, optarg); + str_replace (&Muttrc, optarg); break; case 'f': @@ -589,14 +632,24 @@ int main (int argc, char **argv) break; case 'd': + debug_setlevel(atoi(optarg)); #ifdef DEBUG - debuglevel = atoi (optarg); - printf (_("Debugging at level %d.\n"), debuglevel); + 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 (" + DEBUG_MIN_LEVEL_S "-" DEBUG_MAX_LEVEL_S ").\n")); + return 1; + } #else printf _("DEBUG was not defined during compilation. Ignored.\n"); #endif break; + case 'D': + dump_variables = 1; + break; + case 'e': commands = mutt_add_list (commands, optarg); break; @@ -679,14 +732,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) { + if (!isatty (0) || queries || alias_queries || dump_variables) { set_option (OPTNOCURSES); sendflags = SENDBATCH; } @@ -697,14 +750,17 @@ int main (int argc, char **argv) start_curses (); /* set defaults and read init files */ + mx_init (); mutt_init (flags & M_NOSYSRC, commands); mutt_free_list (&commands); - /* Initialize crypto backends. */ + /* Initialize crypto */ crypt_init (); if (queries) return mutt_query_variables (queries); + if (dump_variables) + return (mutt_dump_variables ()); if (alias_queries) { int rv = 0; @@ -744,7 +800,7 @@ int main (int argc, char **argv) mutt_expand_path (fpath, sizeof (fpath)); #ifdef USE_IMAP /* we're not connected yet - skip mail folder creation */ - if (!mx_is_imap (fpath)) + if (mx_get_magic (fpath) != M_IMAP) #endif if (stat (fpath, &sb) == -1 && errno == ENOENT) { snprintf (msg, sizeof (msg), _("%s does not exist. Create it?"), @@ -796,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; @@ -804,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]; @@ -823,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); @@ -838,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) @@ -851,7 +907,7 @@ int main (int argc, char **argv) } } - FREE (&bodytext); + mem_free (&bodytext); if (attach) { LIST *t = attach; @@ -883,13 +939,13 @@ int main (int argc, char **argv) } else { if (flags & M_BUFFY) { - if (!mutt_buffy_check (0)) { + if (!buffy_check (0)) { mutt_endwin _("No mailbox with new mail."); exit (1); } folder[0] = 0; - mutt_buffy (folder, sizeof (folder)); + buffy_next (folder, sizeof (folder)); } else if (flags & M_SELECT) { #ifdef USE_NNTP @@ -928,8 +984,8 @@ int main (int argc, char **argv) #endif mutt_expand_path (folder, sizeof (folder)); - mutt_str_replace (&CurrentFolder, folder); - mutt_str_replace (&LastFolder, folder); + str_replace (&CurrentFolder, folder); + str_replace (&LastFolder, folder); if (flags & M_IGNORE) { /* check to see if there are any messages in the folder */ @@ -950,8 +1006,10 @@ int main (int argc, char **argv) M_READONLY : 0, NULL)) || !explicit_folder) { mutt_index_menu (); + if (option (OPTXTERMSETTITLES)) + mutt_xterm_set_title (NONULL (XtermLeave)); if (Context) - FREE (&Context); + mem_free (&Context); } mutt_endwin (Errorbuf); }