X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=62474293933902f1ea82b18f0aa5f0faa7747af3;hp=f6e8d1f8aa44461e76215faac7e047bfac15c2f3;hb=dc726add2e8fe52be1f6859ea7cbe4651498eeb8;hpb=10b7d54ecaa5c54622bf1239b57fa2e3359db0e1 diff --git a/main.c b/main.c index f6e8d1f..6247429 100644 --- a/main.c +++ b/main.c @@ -15,35 +15,24 @@ #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 "mutt_crypt.h" -#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 +#include "mutt_sasl.h" #ifdef HAVE_GETOPT_H #include @@ -56,486 +45,126 @@ extern int optind; #include #endif -#ifdef USE_NNTP -#include "nntp/nntp.h" -#endif - -#ifdef USE_LIBESMTP -#include -#endif - #ifdef USE_HCACHE -#if HAVE_QDBM +#if defined(HAVE_QDBM) #include -#elif HAVE_GDBM +#elif defined(HAVE_GDBM) #include -#elif HAVE_DB4 -#include #endif #endif -#ifdef USE_GNUTLS #include -#endif - -#ifdef CRYPT_BACKEND_GPGME #include -#endif - -#ifdef USE_SSL -#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\ -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\ -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_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\ -"); - -void mutt_exit (int code) +void mutt_exit(int code) { - mutt_endwin (NULL); - exit (code); + mutt_endwin(NULL); + exit(code); } static void mutt_usage (void) { - 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 ] -t"); - puts - _("\ - 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\ -\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 ~/.muttngdebug0"); -#endif - puts _("\ - -e \tspecify a command to be executed after initialization\n\ - -f \tspecify which mailbox to read\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"); - puts _("\ - -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)"); - puts _("\ - -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\ - -z\t\texit immediately if there are no messages in the mailbox\n\ - -Z\t\topen the first folder with new message, exit immediately if none\n\ - -h\t\tthis help message"); - - exit (0); + puts(mutt_make_version()); + + puts(_("\ +usage: madmutt [ -nRyzZ ] [ -e ] [ -F ] [ -f ]\n\ + madmutt [ -n ] [ -e ] [ -a ] [ -F ] [ -H ] [ -i ] [ -s ] [ -b ] [ -c ] [ ... ]\n\ + madmutt [ -n ] [ -e ] [ -F ] -p\n\ + madmutt -v\n")); + + puts(_("Options:")); + puts(_(" -a attach a file to the message")); + puts(_(" -b
specify a blind carbon-copy (BCC) address")); + puts(_(" -c
specify a carbon-copy (CC) address")); + puts(_(" -e specify a command to be executed after initialization")); + puts(_(" -f specify which mailbox to read")); + puts(_(" -F specify an alternate Madmuttrc file")); + puts(_(" -H specify a draft file to read header and body from")); + puts(_(" -i specify a file which Madmutt should include in the body")); + puts(_(" -n causes Madmutt not to read the system Madmuttrc")); + puts(_(" -p recall a postponed message")); + puts(_(" -R open mailbox in read-only mode")); + puts(_(" -s specify a subject (must be in quotes if it has spaces)")); + puts(_(" -v show version and compile-time definitions")); + puts(_(" -y select a mailbox specified in your `mailboxes' list")); + puts(_(" -z exit immediately if there are no messages in the mailbox")); + puts(_(" -Z open the first folder with new message, exit immediately if none")); + puts(_(" -h this help message")); + + exit(0); } static void show_version (void) { - struct utsname uts; -#ifdef USE_LIBESMTP - char buf[STRING]; -#endif - - puts (mutt_make_version (1)); - puts (_(Notice)); - - uname (&uts); - -#ifdef _AIX - printf ("System:\n %s %s.%s", uts.sysname, uts.version, uts.release); -#elif defined (SCO) - printf ("System:\n SCO %s", uts.release); -#else - printf ("System:\n %s %s", uts.sysname, uts.release); -#endif - - printf (" (%s)\nExternal Libraries:\n", uts.machine); - + struct utsname uts; + uname(&uts); + + puts(mutt_make_version()); + puts(_(" Copyright (C) 1996-2002 Michael R. Elkins and others.")); + puts(_(" Copyright (C) 2005 The Mutt-ng Team")); + puts(_(" Copyright (C) 2006-2007 Pierre Habouzit")); + puts(_(" MadMutt is based on Mutt-ng wich was based on Mutt before")); + puts(""); + + printf("System:\n %s %s (%s)\n", uts.sysname, uts.release, uts.machine); + puts("External Libraries:"); #ifdef NCURSES_VERSION - printf (" ncurses %s\n", NCURSES_VERSION); -#elif defined(USE_SLANG_CURSES) - printf (" slang %d\n", SLANG_VERSION); + printf(" ncurses %s\n", NCURSES_VERSION); #endif - #ifdef _LIBICONV_VERSION - printf (" libiconv %d.%d\n", _LIBICONV_VERSION >> 8, - _LIBICONV_VERSION & 0xff); -#endif - -#ifdef HAVE_LIBIDN - printf (" libidn %s (compiled with %s)\n", - stringprep_check_version (NULL), STRINGPREP_VERSION); + printf(" libiconv %d.%d\n", _LIBICONV_VERSION >> 8, + _LIBICONV_VERSION & 0xff); #endif - -#ifdef USE_LIBESMTP - smtp_version (buf, sizeof (buf), 0); - printf (" libESMTP %s\n", buf); +#ifdef STRINGPREP_VERSION + printf(" libidn %s\n", STRINGPREP_VERSION); #endif - #ifdef 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 USE_GNUTLS - printf (" gnutls %s\n", LIBGNUTLS_VERSION); -#endif - -#ifdef USE_SSL - printf (" %s\n",OPENSSL_VERSION_TEXT); -#endif - -#ifdef CRYPT_BACKEND_GPGME - printf (" gpgme %s\n", GPGME_VERSION); +#if defined(HAVE_QDBM) + printf(" qdbm %s\n", dpversion); +#elif defined(HAVE_GDBM) + printf(" gdbm %s\n", gdbm_version); #endif - - puts (_("Compile Options:")); - -#ifdef DEBUG - puts (" +DEBUG"); -#else - puts (" -DEBUG"); #endif + printf(" gnutls %s\n", LIBGNUTLS_VERSION); + printf(" gpgme %s\n", GPGME_VERSION); + puts (_("Compile Options:")); - puts ( -#ifdef HOMESPOOL - " +HOMESPOOL " -#else - " -HOMESPOOL " -#endif -#ifdef USE_SETGID - "+USE_SETGID " -#else - "-USE_SETGID " -#endif -#ifdef USE_DOTLOCK - "+USE_DOTLOCK " -#else - "-USE_DOTLOCK " -#endif + puts ( #ifdef USE_FCNTL - "+USE_FCNTL " + " +USE_FCNTL" #else - "-USE_FCNTL " + " -USE_FCNTL" #endif #ifdef USE_FLOCK - "+USE_FLOCK " + " +USE_FLOCK" #else - "-USE_FLOCK " -#endif -#ifdef USE_INODESORT - "+USE_INODESORT " -#else - "-USE_INODESORT " + " -USE_FLOCK" #endif #ifdef USE_HCACHE - "+USE_HCACHE " -#else - "-USE_HCACHE " -#endif - ); - puts ( -#ifdef USE_POP - " +USE_POP " -#else - " -USE_POP " -#endif -#ifdef USE_NNTP - "+USE_NNTP " -#else - "-USE_NNTP " -#endif -#ifdef USE_IMAP - "+USE_IMAP " -#else - "-USE_IMAP " -#endif -#ifdef USE_GSS - "+USE_GSS " -#else - "-USE_GSS " -#endif -#ifdef USE_SSL - "+USE_SSL " -#else - "-USE_SSL " -#endif -#ifdef USE_GNUTLS - "+USE_GNUTLS " -#else - "-USE_GNUTLS " -#endif -#ifdef USE_SASL - "+USE_SASL " -#else - "-USE_SASL " -#endif -#ifdef USE_LIBESMTP - "+USE_LIBESMTP " -#else - "-USE_LIBESMTP " -#endif - "\n " -#ifdef HAVE_REGCOMP - "+HAVE_REGCOMP " -#else - "-HAVE_REGCOMP " -#endif -#ifdef USE_GNU_REGEX - "+USE_GNU_REGEX " -#else - "-USE_GNU_REGEX " -#endif -#ifdef USE_COMPRESSED - "+COMPRESSED " -#else - "-COMPRESSED " -#endif - "\n " -#ifdef HAVE_COLOR - "+HAVE_COLOR " -#else - "-HAVE_COLOR " -#endif -#ifdef HAVE_START_COLOR - "+HAVE_START_COLOR " -#else - "-HAVE_START_COLOR " -#endif -#ifdef HAVE_TYPEAHEAD - "+HAVE_TYPEAHEAD " -#else - "-HAVE_TYPEAHEAD " -#endif -#ifdef HAVE_BKGDSET - "+HAVE_BKGDSET " -#else - "-HAVE_BKGDSET " -#endif - "\n " -#ifdef HAVE_CURS_SET - "+HAVE_CURS_SET " -#else - "-HAVE_CURS_SET " -#endif -#ifdef HAVE_META - "+HAVE_META " -#else - "-HAVE_META " -#endif -#ifdef HAVE_RESIZETERM - "+HAVE_RESIZETERM " -#else - "-HAVE_RESIZETERM " -#endif - ); - - puts ( -#ifdef CRYPT_BACKEND_GPGME - "+CRYPT_BACKEND_GPGME " -#else - "-CRYPT_BACKEND_GPGME " -#endif -#ifdef BUFFY_SIZE - "+BUFFY_SIZE " -#else - "-BUFFY_SIZE " -#endif -#ifdef SUN_ATTACHMENT - "+SUN_ATTACHMENT " -#else - "-SUN_ATTACHMENT " -#endif - "\n " -#ifdef ENABLE_NLS - "+ENABLE_NLS " -#else - "-ENABLE_NLS " -#endif -#ifdef LOCALES_HACK - "+LOCALES_HACK " -#else - "-LOCALES_HACK " -#endif -#ifdef HAVE_WC_FUNCS - "+HAVE_WC_FUNCS " -#else - "-HAVE_WC_FUNCS " -#endif -#ifdef HAVE_LANGINFO_CODESET - "+HAVE_LANGINFO_CODESET " -#else - "-HAVE_LANGINFO_CODESET " -#endif -#ifdef HAVE_LANGINFO_YESEXPR - "+HAVE_LANGINFO_YESEXPR " -#else - "-HAVE_LANGINFO_YESEXPR " -#endif - "\n " -#if HAVE_ICONV - "+HAVE_ICONV " -#else - "-HAVE_ICONV " -#endif -#if ICONV_NONTRANS - "+ICONV_NONTRANS " -#else - "-ICONV_NONTRANS " -#endif -#if HAVE_LIBIDN - "+HAVE_LIBIDN " -#else - "-HAVE_LIBIDN " -#endif -#if HAVE_GETSID - "+HAVE_GETSID " -#else - "-HAVE_GETSID " -#endif -#if HAVE_GETADDRINFO - "+HAVE_GETADDRINFO " -#else - "-HAVE_GETADDRINFO " -#endif - ); - - puts (_("Built-In Defaults:")); - -#ifdef DOMAIN - printf (" +DOMAIN=\"%s\"\n", DOMAIN); -#else - puts (" -DOMAIN"); -#endif - -#ifdef ISPELL - printf (" +ISPELL=\"%s\"\n", ISPELL); + " +USE_HCACHE" #else - puts (" -ISPELL"); + " -USE_HCACHE" #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); - printf (" +EXECSHELL=\"%s\"\n", EXECSHELL); -#ifdef MIXMASTER - printf (" +MIXMASTER=\"%s\"\n\n", MIXMASTER); +#ifdef HAVE_LIBIDN + " +HAVE_LIBIDN" #else - puts (" -MIXMASTER\n"); + " -HAVE_LIBIDN" #endif + ); - puts (_(ReachingUs)); - - puts (_("MadMutt is based on Mutt-ng wich was based on Mutt before\n")); - - exit (0); -} - -static void start_curses (void) -{ - km_init (); /* must come before mutt_init */ + puts(_("Built-In Defaults:")); + 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 USE_SLANG_CURSES - SLtt_Ignore_Beep = 1; /* don't do that #*$@^! annoying visual beep! */ - SLsmg_Display_Eight_Bit = 128; /* characters above this are printable */ - SLtt_set_color (0, NULL, "default", "default"); -#else - /* should come before initscr() so that ncurses 4.2 doesn't try to install - its own SIGWINCH handler */ - mutt_signal_init (); -#endif - if (initscr () == NULL) { - puts _("Error initializing terminal."); + puts(""); + puts(_("This is free software. You may redistribute copies of it under the terms of")); + puts(_("the GNU General Public License .")); + puts(_("There is NO WARRANTY, to the extent permitted by law.")); - 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 - ci_start_color (); - keypad (stdscr, TRUE); - cbreak (); - noecho (); -#if HAVE_TYPEAHEAD - typeahead (-1); /* simulate smooth scrolling */ -#endif -#if HAVE_META - meta (stdscr, TRUE); -#endif + exit(0); } #define M_IGNORE (1<<0) /* -z */ @@ -543,9 +172,18 @@ static void start_curses (void) #define M_NOSYSRC (1<<2) /* -n */ #define M_RO (1<<3) /* -R */ #define M_SELECT (1<<4) /* -y */ -#ifdef USE_NNTP #define M_NEWS (1<<5) /* -g and -G */ -#endif + +__attribute__((format(printf, 1, 0))) +static void mutt_nocurses_error (const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + vfprintf(stderr, fmt, ap); + va_end(ap); + fputc('\n', stderr); +} int main (int argc, char **argv) { @@ -553,21 +191,17 @@ int main (int argc, char **argv) char *subject = NULL; char *includeFile = NULL; 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; int sendflags = 0; int flags = 0; int version = 0; int i; int explicit_folder = 0; - 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 */ @@ -576,35 +210,17 @@ int main (int argc, char **argv) exit (1); } -#ifdef ENABLE_NLS - /* FIXME what about init.c:1439 ? */ setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, MUTTLOCALEDIR); textdomain (PACKAGE); -#endif - setlocale (LC_CTYPE, ""); - mutt_error = mutt_nocurses_error; - mutt_message = mutt_nocurses_error; - SRAND (time (NULL)); + mutt_error = mutt_message = mutt_nocurses_error; + srand48 (time (NULL)); umask (077); - p_clear(Options, sizeof(Options)); - p_clear(QuadOptions, sizeof(QuadOptions)); - -#ifdef USE_NNTP - while ((i = - getopt (argc, argv, - "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:d:e:H:s:i:hm:npQ:RTtvxyzZ")) != EOF) -#endif + while ((i = getopt(argc, argv, "a:b:F:f:c:e:H:s:i:hnpRTtvyzZ")) >= 0) switch (i) { - case 'A': - alias_queries = mutt_add_list (alias_queries, optarg); - break; case 'a': if (strlen(optarg)<=512) attach = mutt_add_list (attach, optarg); @@ -626,34 +242,15 @@ int main (int argc, char **argv) case 'b': case 'c': if (!msg) - msg = mutt_new_header (); + msg = header_new(); if (!msg->env) - msg->env = mutt_new_envelope (); + msg->env = envelope_new(); if (i == 'b') msg->env->bcc = rfc822_parse_adrlist (msg->env->bcc, optarg); else 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; - - case 'T': - dump_variables = 1; - break; - case 'e': commands = mutt_add_list (commands, optarg); break; @@ -666,11 +263,6 @@ int main (int argc, char **argv) includeFile = optarg; break; - case 'm': - /* should take precedence over .muttrc setting, so save it for later */ - newMagic = optarg; - break; - case 'n': flags |= M_NOSYSRC; break; @@ -679,10 +271,6 @@ int main (int argc, char **argv) sendflags |= SENDPOSTPONED; break; - case 'Q': - queries = mutt_add_list (queries, optarg); - break; - case 'R': flags |= M_RO; /* read-only mode */ break; @@ -695,28 +283,10 @@ int main (int argc, char **argv) version++; break; - case 'x': /* mailx compatible send mode */ - sendflags |= SENDMAILX; - break; - case 'y': /* My special hack mode */ flags |= M_SELECT; break; -#ifdef USE_NNTP - case 'g': /* Specify a newsserver */ - { - char buf[LONG_STRING]; - - snprintf (buf, sizeof (buf), "set nntp_host=%s", optarg); - commands = mutt_add_list (commands, buf); - } - - case 'G': /* List of newsgroups */ - flags |= M_SELECT | M_NEWS; - break; -#endif - case 'z': flags |= M_IGNORE; break; @@ -729,91 +299,46 @@ 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)); - puts (_(ReachingUs)); - exit (0); } /* Check for a batch send. */ - if (!isatty (0) || queries || alias_queries || dump_variables > 0) { - set_option (OPTNOCURSES); + if (!isatty (0)) { + set_option(OPTNOCURSES); sendflags = SENDBATCH; } /* This must come before mutt_init() because curses needs to be started before calling the init_pair() function to set the color scheme. */ - if (!option (OPTNOCURSES)) - start_curses (); + if (!option (OPTNOCURSES)) { + km_init(); + curses_initialize(); + mutt_signal_initialize(); + } /* set defaults and read init files */ - mx_init (); mutt_init (flags & M_NOSYSRC, commands); - mutt_free_list (&commands); + string_list_wipe(&commands); - /* Initialize crypto */ - crypt_init (); - - if (queries) - return mutt_query_variables (queries); - if (dump_variables > 0) - return (mutt_dump_variables (dump_variables-1)); - - if (alias_queries) { - int rv = 0; - address_t *a; - - for (; alias_queries; alias_queries = alias_queries->next) { - if ((a = mutt_lookup_alias (alias_queries->data))) { - /* output in machine-readable form */ - mutt_addrlist_to_idna (a, NULL); - mutt_write_address_list (a, stdout, 0, 0); - } - else { - rv = 1; - printf ("%s\n", alias_queries->data); - } - } - return rv; - } - - if (newMagic) - mx_set_magic (newMagic); - - if (!option (OPTNOCURSES)) { - SETCOLOR (MT_COLOR_NORMAL); - clear (); - mutt_error = mutt_curses_error; - mutt_message = mutt_curses_message; + if (!option(OPTNOCURSES)) { + ui_layout_init(); } /* Create the Maildir directory if it doesn't exist. */ - if (!option (OPTNOCURSES) && Maildir) { + if (!option(OPTNOCURSES) && Maildir) { struct stat sb; char fpath[_POSIX_PATH_MAX]; - char msg[STRING]; + char mesg[STRING]; m_strcpy(fpath, sizeof(fpath), Maildir); mutt_expand_path (fpath, sizeof (fpath)); -#ifdef USE_IMAP /* we're not connected yet - skip mail folder creation */ 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?"), + snprintf (mesg, sizeof (mesg), _("%s does not exist. Create it?"), Maildir); - if (mutt_yesorno (msg, M_YES) == M_YES) { + if (mutt_yesorno (mesg, M_YES) == M_YES) { if (mkdir (fpath, 0700) == -1 && errno != EEXIST) mutt_error (_("Can't create %s: %s."), Maildir, strerror (errno)); } @@ -832,18 +357,19 @@ 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 (); if (!msg) - msg = mutt_new_header (); + msg = header_new(); if (draftFile) infile = draftFile; else { if (!msg->env) - msg->env = mutt_new_envelope (); + msg->env = envelope_new(); for (i = optind; i < argc; i++) { if (url_check_scheme (argv[i]) == U_MAILTO) @@ -886,22 +412,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(mod_core.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); } @@ -909,16 +433,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) { @@ -932,12 +456,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); @@ -956,23 +480,14 @@ int main (int argc, char **argv) buffy_next (folder, sizeof (folder)); } else if (flags & M_SELECT) { -#ifdef USE_NNTP - if (flags & M_NEWS) { - set_option (OPTNEWS); - if (!(CurrentNewsSrv = mutt_select_newsserver (NewsServer))) { - mutt_endwin (Errorbuf); - exit (1); - } - } - else -#endif - if (!Incoming) { + if (!Incoming.len) { mutt_endwin _("No incoming mailboxes defined."); exit (1); } folder[0] = 0; - mutt_select_file (folder, sizeof (folder), M_SEL_FOLDER | M_SEL_BUFFY); + mutt_select_file(folder, sizeof(folder), M_SEL_FOLDER | M_SEL_BUFFY, + NULL, NULL); if (!folder[0]) { mutt_endwin (NULL); exit (0); @@ -982,16 +497,7 @@ int main (int argc, char **argv) if (!folder[0]) m_strcpy(folder, sizeof(folder), NONULL(Spoolfile)); -#ifdef USE_NNTP - if (option (OPTNEWS)) { - unset_option (OPTNEWS); - nntp_expand_path (folder, sizeof (folder), - &CurrentNewsSrv->conn->account); - } - else -#endif - mutt_expand_path (folder, sizeof (folder)); - + mutt_expand_path (folder, sizeof (folder)); m_strreplace(&CurrentFolder, folder); m_strreplace(&LastFolder, folder); @@ -1009,18 +515,19 @@ int main (int argc, char **argv) mutt_folder_hook (folder); - if ((Context = mx_open_mailbox (folder, ((flags & M_RO) - || option (OPTREADONLY)) ? - M_READONLY : 0, NULL)) - || !explicit_folder) { + if ((Context = mx_open_mailbox(folder, (flags & M_RO) ? M_READONLY : 0, + NULL)) || !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(); + mutt_sasl_shutdown(); exit (0); }