X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=801966b3c6b5bfec63c491ca7047baed4b447fad;hp=da1b66d0b8327b62908b7bf1608e88030362f4e6;hb=4f8cd7c03aba20081ae3403ee194ce7e54f224fd;hpb=b1c9f537b475b3bc8f6517bb4d7008a411bb478e diff --git a/main.c b/main.c index da1b66d..801966b 100644 --- a/main.c +++ b/main.c @@ -23,15 +23,16 @@ #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 @@ -48,31 +49,16 @@ extern int optind; #include #endif -#ifdef USE_LIBESMTP -#include -#endif - #ifdef USE_HCACHE #if defined(HAVE_QDBM) #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\ @@ -140,9 +126,6 @@ options:\n\ static void show_version (void) { struct utsname uts; -#ifdef USE_LIBESMTP - char buf[STRING]; -#endif puts (mutt_make_version()); puts (_(Notice)); @@ -175,42 +158,19 @@ static void show_version (void) stringprep_check_version (NULL), STRINGPREP_VERSION); #endif -#ifdef USE_LIBESMTP - smtp_version (buf, sizeof (buf), 0); - printf (" libESMTP %s\n", buf); -#endif - #ifdef USE_HCACHE #if defined(HAVE_QDBM) 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 @@ -238,129 +198,14 @@ 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 - "-USE_LIBESMTP " -#endif - "\n " -#ifdef HAVE_REGCOMP - "+HAVE_REGCOMP " -#else - "-HAVE_REGCOMP " -#endif - "\n " -#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 - "\n " -#ifdef ENABLE_NLS - "+ENABLE_NLS " -#else - "-ENABLE_NLS " -#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 " -#ifdef HAVE_ICONV - "+HAVE_ICONV " -#else - "-HAVE_ICONV " -#endif #ifdef HAVE_LIBIDN "+HAVE_LIBIDN " #else "-HAVE_LIBIDN " -#endif -#ifdef HAVE_GETSID - "+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); @@ -413,6 +258,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] = ""; @@ -442,17 +298,12 @@ 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; + mutt_error = mutt_message = mutt_nocurses_error; srand48 (time (NULL)); umask (077); @@ -596,9 +447,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) @@ -724,7 +572,7 @@ int main (int argc, char **argv) /* is the following if still needed? */ - fout = m_tempfile(buf, sizeof(buf), NONULL(Tempdir), NULL); + fout = m_tempfile(buf, sizeof(buf), NONULL(mod_core.tmpdir), NULL); tempfile = m_strdup(buf); if (tempfile) { @@ -802,7 +650,8 @@ int main (int argc, char **argv) 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); @@ -852,5 +701,6 @@ int main (int argc, char **argv) } luaM_shutdown(); + mutt_sasl_shutdown(); exit (0); }