X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=4a1fe591a901b9b7d07a2e5d3a659103f122906f;hp=ada2c8d6fd0efb3bf1c2f2de62b43b303ff4258d;hb=0c73c9a8dd4f023a9d2cce2e72904e8bbc9ade3e;hpb=7cf9f06d9ba7bcda54db3c668bfa0fde99abf34f diff --git a/main.c b/main.c index ada2c8d..4a1fe59 100644 --- a/main.c +++ b/main.c @@ -15,35 +15,23 @@ #define MAIN_C 1 -#if HAVE_CONFIG_H -# include "config.h" -#endif +#include + +#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "mutt.h" -#include "mx.h" +#include "crypt.h" +#include "alias.h" #include "buffy.h" #include "sort.h" -#include -#include "mutt_curses.h" #include "keymap.h" -#include "url.h" #include "mutt_idna.h" -#include "xterm.h" - -#include "lib/debug.h" - -#include -#include -#include -#include -#include -#include -#include #ifdef HAVE_GETOPT_H #include @@ -57,7 +45,7 @@ extern int optind; #endif #ifdef USE_NNTP -#include "nntp/nntp.h" +#include #endif #ifdef USE_LIBESMTP @@ -65,11 +53,11 @@ extern int optind; #endif #ifdef USE_HCACHE -#if HAVE_QDBM +#if defined(HAVE_QDBM) #include -#elif HAVE_GDBM +#elif defined(HAVE_GDBM) #include -#elif HAVE_DB4 +#elif defined(HAVE_DB4) #include #endif #endif @@ -78,9 +66,7 @@ extern int optind; #include #endif -#ifdef CRYPT_BACKEND_GPGME #include -#endif #ifdef USE_SSL #include @@ -88,47 +74,11 @@ extern int optind; static const char *Notice = N_("\ Copyright (C) 1996-2002 Michael R. Elkins and others.\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 `madmutt -vv' for details.\n"); - -static const char *Copyright_Mutt = N_("\ -Copyright (C) 1996-2004 Michael R. Elkins \n\ -Copyright (C) 1996-2002 Brandon Long \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"); - -static const char *Copyright_Mutt_NG = 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."); - -static const char* Copyright_GPL_1 = N_("\ -\n\ - This program is free software; you can redistribute it and/or modify\n\ - it under the terms of the GNU General Public License as published by\n\ - the Free Software Foundation; either version 2 of the License, or\n\ - (at your option) any later version.\n"); - -static const char* Copyright_GPL_2 = N_("\ - This program is distributed in the hope that it will be useful,\n\ - but WITHOUT ANY WARRANTY; without even the implied warranty of\n\ - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\ - GNU General Public License for more details.\n"); - -static const char* Copyright_GPL_3 = N_("\ - You should have received a copy of the GNU General Public License\n\ - along with this program; if not, write to the Free Software\n\ - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n\ -"); +Copyright (C) 2005 The Mutt-ng Team\n\ +Copyright (C) 2006 Pierre Habouzit undation, Inc.\n\ +This is free software. You may redistribute copies of it under the terms of\n\ +the GNU General Public License .\n\ +There is NO WARRANTY, to the extent permitted by law.\n"); void mutt_exit (int code) { @@ -138,7 +88,7 @@ void mutt_exit (int code) static void mutt_usage (void) { - puts (mutt_make_version (1)); + puts (mutt_make_version()); puts _("usage: madmutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f ]\n\ @@ -150,16 +100,13 @@ static void mutt_usage (void) madmutt [ -nR ] [ -e ] [ -F ] -T\n\ madmutt [ -nx ] [ -e ] [ -a ] [ -F ] [ -H ] [ -i ] [ -s ] [ -b ] [ -c ] [ ... ]\n\ madmutt [ -n ] [ -e ] [ -F ] -p\n\ - madmutt -v[v]\n\ + madmutt -v\n\ \n\ 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"); -#if DEBUG - puts _(" -d \tlog debugging output to ~/.madmuttdebug0"); -#endif puts _("\ -e \tspecify a command to be executed after initialization\n\ -f \tspecify which mailbox to read\n\ @@ -195,7 +142,7 @@ static void show_version (void) char buf[STRING]; #endif - puts (mutt_make_version (1)); + puts (mutt_make_version()); puts (_(Notice)); uname (&uts); @@ -232,11 +179,11 @@ static void show_version (void) #endif #ifdef USE_HCACHE -#if HAVE_QDBM +#if defined(HAVE_QDBM) printf (" qdbm %s\n", dpversion); -#elif HAVE_GDBM +#elif defined(HAVE_GDBM) printf (" gdbm %s\n", gdbm_version); -#elif HAVE_DB4 +#elif defined(HAVE_DB4) printf (" DB4 %d.%d.%d\n", DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH); #endif @@ -250,18 +197,9 @@ static void show_version (void) printf (" %s\n",OPENSSL_VERSION_TEXT); #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 " @@ -273,11 +211,6 @@ static void show_version (void) #else "-USE_SETGID " #endif -#ifdef USE_DOTLOCK - "+USE_DOTLOCK " -#else - "-USE_DOTLOCK " -#endif #ifdef USE_FCNTL "+USE_FCNTL " #else @@ -330,18 +263,8 @@ 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 - "+HAVE_COLOR " -#else - "-HAVE_COLOR " -#endif #ifdef HAVE_START_COLOR "+HAVE_START_COLOR " #else @@ -376,16 +299,7 @@ static void show_version (void) ); puts ( -#ifdef CRYPT_BACKEND_GPGME "+CRYPT_BACKEND_GPGME " -#else - "-CRYPT_BACKEND_GPGME " -#endif -#ifdef BUFFY_SIZE - "+BUFFY_SIZE " -#else - "-BUFFY_SIZE " -#endif "\n " #ifdef ENABLE_NLS "+ENABLE_NLS " @@ -408,27 +322,22 @@ static void show_version (void) "-HAVE_LANGINFO_YESEXPR " #endif "\n " -#if HAVE_ICONV +#ifdef HAVE_ICONV "+HAVE_ICONV " #else "-HAVE_ICONV " #endif -#if ICONV_NONTRANS - "+ICONV_NONTRANS " -#else - "-ICONV_NONTRANS " -#endif -#if HAVE_LIBIDN +#ifdef HAVE_LIBIDN "+HAVE_LIBIDN " #else "-HAVE_LIBIDN " #endif -#if HAVE_GETSID +#ifdef HAVE_GETSID "+HAVE_GETSID " #else "-HAVE_GETSID " #endif -#if HAVE_GETADDRINFO +#ifdef HAVE_GETADDRINFO "+HAVE_GETADDRINFO " #else "-HAVE_GETADDRINFO " @@ -436,23 +345,12 @@ static void show_version (void) ); puts (_("Built-In Defaults:")); - -#ifdef ISPELL - printf (" +ISPELL=\"%s\"\n", ISPELL); -#else - puts (" -ISPELL"); -#endif - printf (" +SENDMAIL=\"%s\"\n", SENDMAIL); printf (" +MAILPATH=\"%s\"\n", MAILPATH); printf (" +PKGDATADIR=\"%s\"\n", PKGDATADIR); printf (" +PKGDOCDIR=\"%s\"\n", PKGDOCDIR); printf (" +SYSCONFDIR=\"%s\"\n", SYSCONFDIR); -#ifdef MIXMASTER printf (" +MIXMASTER=\"%s\"\n\n", MIXMASTER); -#else - puts (" -MIXMASTER\n"); -#endif puts (_("MadMutt is based on Madmutt wich was based on Mutt before\n")); @@ -470,25 +368,22 @@ static void start_curses (void) #else /* should come before initscr() so that ncurses 4.2 doesn't try to install its own SIGWINCH handler */ - mutt_signal_init (); + mutt_signal_initialize (); #endif if (initscr () == NULL) { puts _("Error initializing terminal."); exit (1); } -#if 1 /* USE_SLANG_CURSES - commenting out suggested in #455. */ - /* slang requires the signal handlers to be set after initializing */ - mutt_signal_init (); -#endif + mutt_signal_initialize (); ci_start_color (); keypad (stdscr, TRUE); cbreak (); noecho (); -#if HAVE_TYPEAHEAD +#ifdef HAVE_TYPEAHEAD typeahead (-1); /* simulate smooth scrolling */ #endif -#if HAVE_META +#ifdef HAVE_META meta (stdscr, TRUE); #endif } @@ -510,10 +405,10 @@ int main (int argc, char **argv) char *draftFile = NULL; char *newMagic = NULL; HEADER *msg = NULL; - LIST *attach = NULL; - LIST *commands = NULL; - LIST *queries = NULL; - LIST *alias_queries = NULL; + string_list_t *attach = NULL; + string_list_t *commands = NULL; + string_list_t *queries = NULL; + string_list_t *alias_queries = NULL; int sendflags = 0; int flags = 0; int version = 0; @@ -522,7 +417,7 @@ int main (int argc, char **argv) int dump_variables = -1; /* initialize random number for tmp file creation */ - srand ((unsigned int) time (NULL)); + srand48((unsigned int) time (NULL)); /* sanity check against stupid administrators */ @@ -542,20 +437,17 @@ int main (int argc, char **argv) mutt_error = mutt_nocurses_error; mutt_message = mutt_nocurses_error; - SRAND (time (NULL)); + srand48 (time (NULL)); umask (077); - p_clear(Options, sizeof(Options)); - p_clear(QuadOptions, sizeof(QuadOptions)); + p_clear(Options, countof(Options)); + p_clear(QuadOptions, countof(QuadOptions)); + while ((i = getopt(argc, argv, "A:a:b:F:f:c:e:H:s:i:hm:npQ:RTtvyzZ" #ifdef USE_NNTP - while ((i = - getopt (argc, argv, - "A:a:b:F:f:c:d:e:g:GH:s:i:hm:npQ:RTtvyzZ")) != EOF) -#else - while ((i = - getopt (argc, argv, "A:a:b:F:f:c:d:e:H:s:i:hm:npQ:RTtvyzZ")) != EOF) + "g:G" #endif + )) >= 0) switch (i) { case 'A': alias_queries = mutt_add_list (alias_queries, optarg); @@ -590,17 +482,6 @@ int main (int argc, char **argv) msg->env->cc = rfc822_parse_adrlist (msg->env->cc, optarg); break; - case 'd': - { - char buf[LONG_STRING]; - int level = atoi (optarg); - - snprintf (buf, sizeof (buf), "set debug_level=%d", level); - commands = mutt_add_list (commands, buf); - debug_setlevel (level); - } - break; - case 't': dump_variables = 2; break; @@ -680,20 +561,8 @@ int main (int argc, char **argv) mutt_usage (); } - switch (version) { - case 0: - break; - case 1: + if (version) { show_version (); - break; - default: - puts (mutt_make_version (1)); - puts (_(Copyright_Mutt)); - puts (_(Copyright_Mutt_NG)); - puts (_(Copyright_GPL_1)); - puts (_(Copyright_GPL_2)); - puts (_(Copyright_GPL_3)); - exit (0); } /* Check for a batch send. */ @@ -708,12 +577,8 @@ 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 */ - crypt_init (); + string_list_wipe(&commands); if (queries) return mutt_query_variables (queries); @@ -725,12 +590,12 @@ int main (int argc, char **argv) address_t *a; for (; alias_queries; alias_queries = alias_queries->next) { - if ((a = mutt_lookup_alias (alias_queries->data))) { + if ((a = address_list_dup(alias_lookup(alias_queries->data)))) { /* output in machine-readable form */ mutt_addrlist_to_idna (a, NULL); mutt_write_address_list (a, stdout, 0, 0); - } - else { + address_list_wipe(&a); + } else { rv = 1; printf ("%s\n", alias_queries->data); } @@ -780,6 +645,7 @@ int main (int argc, char **argv) char buf[LONG_STRING]; char *tempfile = NULL, *infile = NULL; char *bodytext = NULL; + FILE *fout; if (!option (OPTNOCURSES)) mutt_flushinp (); @@ -834,22 +700,20 @@ int main (int argc, char **argv) else fin = NULL; - mutt_mktemp (buf); - tempfile = m_strdup(buf); - if (draftFile) msg->env = mutt_read_rfc822_header (fin, NULL, 1, 0); /* is the following if still needed? */ - if (tempfile) { - FILE *fout; + fout = m_tempfile(buf, sizeof(buf), NONULL(MCore.tmpdir), NULL); + tempfile = m_strdup(buf); - if ((fout = safe_fopen (tempfile, "w")) == NULL) { + if (tempfile) { + if (!fout) { if (!option (OPTNOCURSES)) mutt_endwin (NULL); perror (tempfile); - fclose (fin); + m_fclose(&fin); p_delete(&tempfile); exit (1); } @@ -857,16 +721,16 @@ int main (int argc, char **argv) mutt_copy_stream (fin, fout); else if (bodytext) fputs (bodytext, fout); - fclose (fout); + m_fclose(&fout); if (fin && fin != stdin) - fclose (fin); + m_fclose(&fin); } } p_delete(&bodytext); if (attach) { - LIST *t = attach; + string_list_t *t = attach; BODY *a = NULL; while (t) { @@ -880,12 +744,12 @@ int main (int argc, char **argv) if (!option (OPTNOCURSES)) mutt_endwin (NULL); fprintf (stderr, _("%s: unable to attach file.\n"), t->data); - mutt_free_list (&attach); + string_list_wipe(&attach); exit (1); } t = t->next; } - mutt_free_list (&attach); + string_list_wipe(&attach); } ci_send_message (sendflags, msg, tempfile, NULL, NULL); @@ -911,10 +775,9 @@ int main (int argc, char **argv) mutt_endwin (Errorbuf); exit (1); } - } - else + } else #endif - if (!Incoming) { + if (!Incoming.len) { mutt_endwin _("No incoming mailboxes defined."); exit (1); @@ -935,8 +798,7 @@ int main (int argc, char **argv) unset_option (OPTNEWS); nntp_expand_path (folder, sizeof (folder), &CurrentNewsSrv->conn->account); - } - else + } else #endif mutt_expand_path (folder, sizeof (folder)); @@ -963,12 +825,13 @@ int main (int argc, char **argv) || !explicit_folder) { mutt_index_menu (); if (option (OPTXTERMSETTITLES)) - mutt_xterm_set_title (NONULL (XtermLeave)); + printf("\033]2;%s\007", NONULL(XtermLeave)); if (Context) p_delete(&Context); } mutt_endwin (Errorbuf); } + luaM_shutdown(); exit (0); }