projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Impose the use of SASL2, so that we can drop a lot of useless old dead code.
[apps/madmutt.git]
/
main.c
diff --git
a/main.c
b/main.c
index
e5dc968
..
8da5c92
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-23,10
+23,10
@@
#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 "alias.h"
#include "buffy.h"
#include "sort.h"
@@
-66,9
+66,7
@@
extern int optind;
#include <gnutls/gnutls.h>
#endif
#include <gnutls/gnutls.h>
#endif
-#ifdef CRYPT_BACKEND_GPGME
#include <gpgme.h>
#include <gpgme.h>
-#endif
#ifdef USE_SSL
#include <openssl/opensslv.h>
#ifdef USE_SSL
#include <openssl/opensslv.h>
@@
-199,10
+197,7
@@
static void show_version (void)
printf (" %s\n",OPENSSL_VERSION_TEXT);
#endif
printf (" %s\n",OPENSSL_VERSION_TEXT);
#endif
-#ifdef CRYPT_BACKEND_GPGME
printf (" gpgme %s\n", GPGME_VERSION);
printf (" gpgme %s\n", GPGME_VERSION);
-#endif
-
puts (_("Compile Options:"));
puts (
puts (_("Compile Options:"));
puts (
@@
-253,11
+248,6
@@
static void show_version (void)
#else
"-USE_GNUTLS "
#endif
#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
@@
-304,11
+294,7
@@
static void show_version (void)
);
puts (
);
puts (
-#ifdef CRYPT_BACKEND_GPGME
"+CRYPT_BACKEND_GPGME "
"+CRYPT_BACKEND_GPGME "
-#else
- "-CRYPT_BACKEND_GPGME "
-#endif
"\n "
#ifdef ENABLE_NLS
"+ENABLE_NLS "
"\n "
#ifdef ENABLE_NLS
"+ENABLE_NLS "
@@
-354,13
+340,6
@@
static void show_version (void)
);
puts (_("Built-In Defaults:"));
);
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 (" +SENDMAIL=\"%s\"\n", SENDMAIL);
printf (" +MAILPATH=\"%s\"\n", MAILPATH);
printf (" +PKGDATADIR=\"%s\"\n", PKGDATADIR);
@@
-413,6
+392,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] = "";
@@
-451,8
+441,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);
@@
-596,9
+585,6
@@
int main (int argc, char **argv)
mutt_init (flags & M_NOSYSRC, commands);
string_list_wipe(&commands);
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)
if (queries)
return mutt_query_variables (queries);
if (dump_variables > 0)