projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix warnings.
[apps/madmutt.git]
/
main.c
diff --git
a/main.c
b/main.c
index
a02ecbc
..
2e1b4d4
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-23,15
+23,16
@@
#include <lib-sys/mutt_signal.h>
#include <lib-mime/mime.h>
#include <lib-ui/curses.h>
#include <lib-sys/mutt_signal.h>
#include <lib-mime/mime.h>
#include <lib-ui/curses.h>
-#include <lib-crypt/crypt.h>
#include <lib-mx/mx.h>
#include "mutt.h"
#include <lib-mx/mx.h>
#include "mutt.h"
+#include "crypt.h"
#include "alias.h"
#include "buffy.h"
#include "sort.h"
#include "keymap.h"
#include "mutt_idna.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 <getopt.h>
#ifdef HAVE_GETOPT_H
#include <getopt.h>
@@
-57,21
+58,12
@@
extern int optind;
#include <depot.h>
#elif defined(HAVE_GDBM)
#include <gdbm.h>
#include <depot.h>
#elif defined(HAVE_GDBM)
#include <gdbm.h>
-#elif defined(HAVE_DB4)
-#include <db.h>
#endif
#endif
#endif
#endif
-#ifdef USE_GNUTLS
#include <gnutls/gnutls.h>
#include <gnutls/gnutls.h>
-#endif
-
#include <gpgme.h>
#include <gpgme.h>
-#ifdef USE_SSL
-#include <openssl/opensslv.h>
-#endif
-
static const char *Notice = N_("\
Copyright (C) 1996-2002 Michael R. Elkins and others.\n\
Copyright (C) 2005 The Mutt-ng Team\n\
static const char *Notice = N_("\
Copyright (C) 1996-2002 Michael R. Elkins and others.\n\
Copyright (C) 2005 The Mutt-ng Team\n\
@@
-183,29
+175,14
@@
static void show_version (void)
printf (" qdbm %s\n", dpversion);
#elif defined(HAVE_GDBM)
printf (" gdbm %s\n", gdbm_version);
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
#endif
#endif
-#ifdef USE_GNUTLS
printf (" gnutls %s\n", LIBGNUTLS_VERSION);
printf (" gnutls %s\n", LIBGNUTLS_VERSION);
-#endif
-
-#ifdef USE_SSL
- printf (" %s\n",OPENSSL_VERSION_TEXT);
-#endif
-
printf (" gpgme %s\n", GPGME_VERSION);
puts (_("Compile Options:"));
puts (
printf (" gpgme %s\n", GPGME_VERSION);
puts (_("Compile Options:"));
puts (
-#ifdef HOMESPOOL
- " +HOMESPOOL "
-#else
- " -HOMESPOOL "
-#endif
#ifdef USE_SETGID
"+USE_SETGID "
#else
#ifdef USE_SETGID
"+USE_SETGID "
#else
@@
-233,26
+210,6
@@
static void show_version (void)
#else
"-USE_NNTP "
#endif
#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
#ifdef USE_LIBESMTP
"+USE_LIBESMTP "
#else
@@
-265,11
+222,6
@@
static void show_version (void)
"-HAVE_REGCOMP "
#endif
"\n "
"-HAVE_REGCOMP "
#endif
"\n "
-#ifdef HAVE_START_COLOR
- "+HAVE_START_COLOR "
-#else
- "-HAVE_START_COLOR "
-#endif
#ifdef HAVE_TYPEAHEAD
"+HAVE_TYPEAHEAD "
#else
#ifdef HAVE_TYPEAHEAD
"+HAVE_TYPEAHEAD "
#else
@@
-316,12
+268,6
@@
static void show_version (void)
#else
"-HAVE_LANGINFO_CODESET "
#endif
#else
"-HAVE_LANGINFO_CODESET "
#endif
-#ifdef HAVE_LANGINFO_YESEXPR
- "+HAVE_LANGINFO_YESEXPR "
-#else
- "-HAVE_LANGINFO_YESEXPR "
-#endif
- "\n "
#ifdef HAVE_ICONV
"+HAVE_ICONV "
#else
#ifdef HAVE_ICONV
"+HAVE_ICONV "
#else
@@
-336,11
+282,6
@@
static void show_version (void)
"+HAVE_GETSID "
#else
"-HAVE_GETSID "
"+HAVE_GETSID "
#else
"-HAVE_GETSID "
-#endif
-#ifdef HAVE_GETADDRINFO
- "+HAVE_GETADDRINFO "
-#else
- "-HAVE_GETADDRINFO "
#endif
);
#endif
);
@@
-397,6
+338,17
@@
static void start_curses (void)
#define M_NEWS (1<<5) /* -g and -G */
#endif
#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] = "";
int main (int argc, char **argv)
{
char folder[_POSIX_PATH_MAX] = "";
@@
-435,8
+387,7
@@
int main (int argc, char **argv)
setlocale (LC_CTYPE, "");
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);
srand48 (time (NULL));
umask (077);
@@
-833,5
+784,6
@@
int main (int argc, char **argv)
}
luaM_shutdown();
}
luaM_shutdown();
+ mutt_sasl_shutdown();
exit (0);
}
exit (0);
}