X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=2e1b4d447b1a94fcccb0f85bca0d7281250044c8;hp=d5e6cf843ad40f66e0b4e56d700ac583a6dfe11d;hb=785bb3cb4dd83ec1071998a64af74e333d076347;hpb=a4831bf15088ad6a734dcd53d5fe66105ccdce47 diff --git a/main.c b/main.c index d5e6cf8..2e1b4d4 100644 --- a/main.c +++ b/main.c @@ -19,18 +19,20 @@ #include +#include #include #include #include -#include #include #include "mutt.h" +#include "crypt.h" #include "alias.h" #include "buffy.h" #include "sort.h" #include "keymap.h" #include "mutt_idna.h" +#include "mutt_sasl.h" #ifdef HAVE_GETOPT_H #include @@ -56,22 +58,11 @@ extern int optind; #include #elif defined(HAVE_GDBM) #include -#elif defined(HAVE_DB4) -#include #endif #endif -#ifdef USE_GNUTLS #include -#endif - -#ifdef CRYPT_BACKEND_GPGME #include -#endif - -#ifdef USE_SSL -#include -#endif static const char *Notice = N_("\ Copyright (C) 1996-2002 Michael R. Elkins and others.\n\ @@ -89,7 +80,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\ @@ -143,7 +134,7 @@ static void show_version (void) char buf[STRING]; #endif - puts (mutt_make_version (1)); + puts (mutt_make_version()); puts (_(Notice)); uname (&uts); @@ -184,32 +175,14 @@ static void show_version (void) printf (" qdbm %s\n", dpversion); #elif defined(HAVE_GDBM) printf (" gdbm %s\n", gdbm_version); -#elif defined(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); -#endif - puts (_("Compile Options:")); puts ( -#ifdef HOMESPOOL - " +HOMESPOOL " -#else - " -HOMESPOOL " -#endif #ifdef USE_SETGID "+USE_SETGID " #else @@ -237,26 +210,6 @@ static void show_version (void) #else "-USE_NNTP " #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 @@ -269,16 +222,6 @@ static void show_version (void) "-HAVE_REGCOMP " #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 @@ -308,11 +251,7 @@ static void show_version (void) ); puts ( -#ifdef CRYPT_BACKEND_GPGME "+CRYPT_BACKEND_GPGME " -#else - "-CRYPT_BACKEND_GPGME " -#endif "\n " #ifdef ENABLE_NLS "+ENABLE_NLS " @@ -329,12 +268,6 @@ static void show_version (void) #else "-HAVE_LANGINFO_CODESET " #endif -#ifdef HAVE_LANGINFO_YESEXPR - "+HAVE_LANGINFO_YESEXPR " -#else - "-HAVE_LANGINFO_YESEXPR " -#endif - "\n " #ifdef HAVE_ICONV "+HAVE_ICONV " #else @@ -349,32 +282,16 @@ static void show_version (void) "+HAVE_GETSID " #else "-HAVE_GETSID " -#endif -#ifdef HAVE_GETADDRINFO - "+HAVE_GETADDRINFO " -#else - "-HAVE_GETADDRINFO " #endif ); 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")); @@ -421,6 +338,17 @@ static void start_curses (void) #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) { char folder[_POSIX_PATH_MAX] = ""; @@ -459,22 +387,18 @@ int main (int argc, char **argv) setlocale (LC_CTYPE, ""); - mutt_error = mutt_nocurses_error; - mutt_message = mutt_nocurses_error; + mutt_error = mutt_message = mutt_nocurses_error; srand48 (time (NULL)); umask (077); 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:e:g:GH:s:i:hm:npQ:RTtvyzZ")) != EOF) -#else - while ((i = - getopt (argc, argv, "A:a:b:F:f:c:e:H:s:i:hm:npQ:RTtvyzZ")) != EOF) + "g:G" #endif + )) >= 0) switch (i) { case 'A': alias_queries = mutt_add_list (alias_queries, optarg); @@ -607,9 +531,6 @@ int main (int argc, char **argv) mutt_init (flags & M_NOSYSRC, commands); string_list_wipe(&commands); - /* Initialize crypto */ - crypt_init (); - if (queries) return mutt_query_variables (queries); if (dump_variables > 0) @@ -675,6 +596,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 (); @@ -729,18 +651,16 @@ 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); @@ -806,8 +726,7 @@ int main (int argc, char **argv) mutt_endwin (Errorbuf); exit (1); } - } - else + } else #endif if (!Incoming.len) { mutt_endwin _("No incoming mailboxes defined."); @@ -830,8 +749,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)); @@ -865,5 +783,7 @@ int main (int argc, char **argv) mutt_endwin (Errorbuf); } + luaM_shutdown(); + mutt_sasl_shutdown(); exit (0); }