X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=4a735efc0656ee30fa93ed97ce8df51deed89842;hp=916f7f002f4fa04b27115656dda8ccc27ab8f6e6;hb=dbacadf0ce81052365d7a43373ac7d4ac67ff91e;hpb=9274cbe8e6410ddb95ddc667faa678a29da85420 diff --git a/main.c b/main.c index 916f7f0..4a735ef 100644 --- a/main.c +++ b/main.c @@ -19,28 +19,34 @@ # include "config.h" #endif +#include +#include +#include +#include +#include +#include +#include + #include #include #include +#include +#include + +#include + +#include #include "mutt.h" -#include "mutt_curses.h" +#include "mx.h" +#include "buffy.h" +#include "sort.h" +#include #include "keymap.h" #include "url.h" -#include "mutt_crypt.h" #include "mutt_idna.h" #include "xterm.h" -#include "lib/debug.h" - -#include -#include -#include -#include -#include -#include -#include - #ifdef HAVE_GETOPT_H #include #else @@ -82,16 +88,11 @@ 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\ +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 `muttng -vv' for details.\n"); +under certain conditions; type `madmutt -vv' for details.\n"); static const char *Copyright_Mutt = N_("\ Copyright (C) 1996-2004 Michael R. Elkins \n\ @@ -142,16 +143,16 @@ 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[v]\n\ \n\ options:\n\ -A \texpand the given alias\n\ @@ -159,7 +160,7 @@ options:\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"); + puts _(" -d \tlog debugging output to ~/.madmuttdebug0"); #endif puts _("\ -e \tspecify a command to be executed after initialization\n\ @@ -168,11 +169,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\ @@ -181,7 +182,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\ @@ -280,12 +280,6 @@ static void show_version (void) #else "-USE_DOTLOCK " #endif -#ifdef DL_STANDALONE - "+DL_STANDALONE " -#else - "-DL_STANDALONE " -#endif - "\n " #ifdef USE_FCNTL "+USE_FCNTL " #else @@ -296,11 +290,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 @@ -308,21 +297,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 @@ -353,16 +332,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 @@ -404,16 +373,6 @@ 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 @@ -423,11 +382,6 @@ static void show_version (void) "+BUFFY_SIZE " #else "-BUFFY_SIZE " -#endif -#ifdef SUN_ATTACHMENT - "+SUN_ATTACHMENT " -#else - "-SUN_ATTACHMENT " #endif "\n " #ifdef ENABLE_NLS @@ -435,11 +389,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 @@ -485,12 +434,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 @@ -502,16 +445,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); } @@ -527,17 +467,14 @@ 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 (); @@ -602,16 +539,16 @@ int main (int argc, char **argv) SRAND (time (NULL)); umask (077); - p_clear(Options, sizeof(Options)); - p_clear(QuadOptions, sizeof(QuadOptions)); + p_clear(Options, countof(Options)); + p_clear(QuadOptions, countof(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) + "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:RTtvxyzZ")) != EOF) + getopt (argc, argv, "A:a:b:F:f:c:d:e:H:s:i:hm:npQ:RTtvyzZ")) != EOF) #endif switch (i) { case 'A': @@ -627,20 +564,20 @@ 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 @@ -707,10 +644,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; @@ -754,7 +687,6 @@ int main (int argc, char **argv) puts (_(Copyright_GPL_1)); puts (_(Copyright_GPL_2)); puts (_(Copyright_GPL_3)); - puts (_(ReachingUs)); exit (0); } @@ -784,7 +716,7 @@ 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))) { @@ -814,18 +746,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)); } @@ -849,13 +779,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) @@ -880,12 +810,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)) @@ -992,7 +922,7 @@ 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)) { @@ -1004,8 +934,8 @@ int main (int argc, char **argv) #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 */