X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=b3d7e66a37de76f50764b6b6003301108b9aab0a;hp=d703022ed4d0b30b030378aec705200704ef796e;hb=5444b60629a8e4d01a78f5999615a084dd6cbd8a;hpb=8e037c67a88cb4680c4391134c578e3b55a80f8a diff --git a/main.c b/main.c index d703022..b3d7e66 100644 --- a/main.c +++ b/main.c @@ -15,32 +15,22 @@ #define MAIN_C 1 -#if HAVE_CONFIG_H -# include "config.h" -#endif +#include + +#include -#include +#include +#include +#include +#include +#include #include "mutt.h" -#include "mutt_curses.h" +#include "alias.h" +#include "buffy.h" +#include "sort.h" #include "keymap.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 -#include -#include -#include -#include -#include #ifdef HAVE_GETOPT_H #include @@ -54,7 +44,7 @@ extern int optind; #endif #ifdef USE_NNTP -#include "nntp/nntp.h" +#include #endif #ifdef USE_LIBESMTP @@ -62,11 +52,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 @@ -83,54 +73,13 @@ extern int optind; #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\ -"); +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) { @@ -143,25 +92,22 @@ 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"); + _("usage: madmutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f ]\n\ + madmutt [ -nR ] [ -e ] [ -F ] -Q [ -Q ] [...]\n\ + madmutt [ -nR ] [ -e ] [ -F ] -A [ -A ] [...]\n\ + madmutt [ -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\ + 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\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\ @@ -169,11 +115,11 @@ options:\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"); + -i \tspecify a file which Madmutt should include in the body"); puts _("\ - -d \t specify debugging level of Mutt-ng\n\ + -d \t specify debugging level of Madmutt\n\ -m \tspecify a default mailbox type\n\ - -n\t\tcauses Mutt-ng not to read the system Muttngrc\n\ + -n\t\tcauses Madmutt not to read the system Madmuttrc\n\ -p\t\trecall a postponed message\n\ -Q \tquery a configuration variable\n\ -R\t\topen mailbox in read-only mode\n\ @@ -182,7 +128,6 @@ options:\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\ -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\ @@ -235,11 +180,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 @@ -259,12 +204,6 @@ static void show_version (void) puts (_("Compile Options:")); -#ifdef DEBUG - puts (" +DEBUG"); -#else - puts (" -DEBUG"); -#endif - puts ( #ifdef HOMESPOOL " +HOMESPOOL " @@ -276,17 +215,6 @@ static void show_version (void) #else "-USE_SETGID " #endif -#ifdef USE_DOTLOCK - "+USE_DOTLOCK " -#else - "-USE_DOTLOCK " -#endif -#ifdef DL_STANDALONE - "+DL_STANDALONE " -#else - "-DL_STANDALONE " -#endif - "\n " #ifdef USE_FCNTL "+USE_FCNTL " #else @@ -297,11 +225,6 @@ static void show_version (void) #else "-USE_FLOCK " #endif -#ifdef USE_INODESORT - "+USE_INODESORT " -#else - "-USE_INODESORT " -#endif #ifdef USE_HCACHE "+USE_HCACHE " #else @@ -309,21 +232,11 @@ static void show_version (void) #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 @@ -354,16 +267,6 @@ static void show_version (void) "+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 @@ -405,30 +308,10 @@ static void show_version (void) ); puts ( -#ifdef CRYPT_BACKEND_CLASSIC_PGP - " +CRYPT_BACKEND_CLASSIC_PGP " -#else - " -CRYPT_BACKEND_CLASSIC_PGP " -#endif -#ifdef CRYPT_BACKEND_CLASSIC_SMIME - "+CRYPT_BACKEND_CLASSIC_SMIME " -#else - "-CRYPT_BACKEND_CLASSIC_SMIME " -#endif #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 @@ -436,11 +319,6 @@ static void show_version (void) #else "-ENABLE_NLS " #endif -#ifdef LOCALES_HACK - "+LOCALES_HACK " -#else - "-LOCALES_HACK " -#endif #ifdef HAVE_WC_FUNCS "+HAVE_WC_FUNCS " #else @@ -457,27 +335,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 " @@ -486,12 +359,6 @@ static void show_version (void) puts (_("Built-In Defaults:")); -#ifdef DOMAIN - printf (" +DOMAIN=\"%s\"\n", DOMAIN); -#else - puts (" -DOMAIN"); -#endif - #ifdef ISPELL printf (" +ISPELL=\"%s\"\n", ISPELL); #else @@ -503,16 +370,13 @@ static void show_version (void) 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); #else puts (" -MIXMASTER\n"); #endif - puts (_(ReachingUs)); - - puts (_("MadMutt is based on Mutt-ng wich was based on Mutt before\n")); + puts (_("MadMutt is based on Madmutt wich was based on Mutt before\n")); exit (0); } @@ -528,25 +392,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 } @@ -568,10 +429,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; @@ -580,7 +441,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 */ @@ -600,20 +461,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); - memset (Options, 0, sizeof (Options)); - memset (QuadOptions, 0, 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:RTtvxyzZ")) != EOF) -#else - while ((i = - getopt (argc, argv, "A:a:b:F:f:c:d:e:H:s:i:hm:npQ:RTtvxyzZ")) != EOF) + "g:G" #endif + )) >= 0) switch (i) { case 'A': alias_queries = mutt_add_list (alias_queries, optarg); @@ -628,37 +486,26 @@ int main (int argc, char **argv) break; case 'F': - str_replace (&Muttrc, optarg); + m_strreplace(&Muttrc, optarg); break; case 'f': - strfcpy (folder, optarg, sizeof (folder)); + m_strcpy(folder, sizeof(folder), optarg); explicit_folder = 1; break; 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; @@ -708,10 +555,6 @@ 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; @@ -742,21 +585,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)); - puts (_(ReachingUs)); - exit (0); } /* Check for a batch send. */ @@ -771,9 +601,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); + string_list_wipe(&commands); /* Initialize crypto */ crypt_init (); @@ -785,15 +614,15 @@ int main (int argc, char **argv) if (alias_queries) { int rv = 0; - ADDRESS *a; + 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); } @@ -815,18 +644,16 @@ int main (int argc, char **argv) if (!option (OPTNOCURSES) && Maildir) { struct stat sb; char fpath[_POSIX_PATH_MAX]; - char msg[STRING]; + char mesg[STRING]; - strfcpy (fpath, Maildir, sizeof (fpath)); + 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)); } @@ -850,13 +677,13 @@ int main (int argc, char **argv) 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) @@ -873,7 +700,7 @@ int main (int argc, char **argv) } if (subject) - msg->env->subject = str_dup (subject); + msg->env->subject = m_strdup(subject); if (includeFile) infile = includeFile; @@ -881,12 +708,12 @@ int main (int argc, char **argv) if (infile || bodytext) { if (infile) { - if (str_cmp ("-", infile) == 0) + if (m_strcmp("-", infile) == 0) fin = stdin; else { char path[_POSIX_PATH_MAX]; - strfcpy (path, infile, sizeof (path)); + m_strcpy(path, sizeof(path), infile); mutt_expand_path (path, sizeof (path)); if ((fin = fopen (path, "r")) == NULL) { if (!option (OPTNOCURSES)) @@ -900,7 +727,7 @@ int main (int argc, char **argv) fin = NULL; mutt_mktemp (buf); - tempfile = str_dup (buf); + tempfile = m_strdup(buf); if (draftFile) msg->env = mutt_read_rfc822_header (fin, NULL, 1, 0); @@ -914,7 +741,7 @@ int main (int argc, char **argv) if (!option (OPTNOCURSES)) mutt_endwin (NULL); perror (tempfile); - fclose (fin); + m_fclose(&fin); p_delete(&tempfile); exit (1); } @@ -922,16 +749,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) { @@ -945,12 +772,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); @@ -976,10 +803,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); @@ -993,20 +819,19 @@ int main (int argc, char **argv) } if (!folder[0]) - strfcpy (folder, NONULL (Spoolfile), sizeof (folder)); + 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 + } else #endif mutt_expand_path (folder, sizeof (folder)); - str_replace (&CurrentFolder, folder); - str_replace (&LastFolder, folder); + m_strreplace(&CurrentFolder, folder); + m_strreplace(&LastFolder, folder); if (flags & M_IGNORE) { /* check to see if there are any messages in the folder */ @@ -1028,7 +853,7 @@ 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); }