X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=56030ee48350371eff09e9a1d1ec26af442fe73a;hp=9af3581011300a468739333435cacf085df1cad5;hb=99f5c6c8a6c4e73aeb253e5c7f1d0035cabc8db0;hpb=9a1efcc01ddeca4106847f8eb28a704aca2dcf0b diff --git a/main.c b/main.c index 9af3581..56030ee 100644 --- a/main.c +++ b/main.c @@ -20,17 +20,21 @@ #endif #include +#include #include +#include #include "mutt.h" +#include "mx.h" +#include "buffy.h" +#include "sort.h" +#include #include "mutt_curses.h" #include "keymap.h" #include "url.h" -#include "mutt_crypt.h" #include "mutt_idna.h" #include "xterm.h" -#include "lib/str.h" #include "lib/debug.h" #include @@ -181,7 +185,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 +283,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 +293,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 +300,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 @@ -358,11 +340,6 @@ static void show_version (void) "+USE_GNU_REGEX " #else "-USE_GNU_REGEX " -#endif -#ifdef USE_COMPRESSED - "+COMPRESSED " -#else - "-COMPRESSED " #endif "\n " #ifdef HAVE_COLOR @@ -404,16 +381,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 +390,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 +397,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 +442,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,7 +453,6 @@ 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 @@ -602,16 +552,16 @@ int main (int argc, char **argv) SRAND (time (NULL)); umask (077); - memset (Options, 0, sizeof (Options)); - memset (QuadOptions, 0, sizeof (QuadOptions)); + 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) + "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,11 +577,11 @@ 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; @@ -707,10 +657,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; @@ -784,7 +730,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))) { @@ -816,12 +762,10 @@ int main (int argc, char **argv) char fpath[_POSIX_PATH_MAX]; char msg[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?"), Maildir); @@ -872,7 +816,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; @@ -880,12 +824,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)) @@ -899,7 +843,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); @@ -992,7 +936,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 +948,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 */