#include <sys/utsname.h>
+#include <lib-lua/lib-lua.h>
#include <lib-sys/mutt_signal.h>
#include <lib-mime/mime.h>
#include <lib-ui/curses.h>
#include <lib-mx/mx.h>
#include "mutt.h"
+#include "crypt.h"
#include "alias.h"
#include "buffy.h"
#include "sort.h"
-#include <lib-crypt/crypt.h>
#include "keymap.h"
#include "mutt_idna.h"
-#include "xterm.h"
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif
#ifdef USE_NNTP
-#include "nntp/nntp.h"
+#include <nntp/nntp.h>
#endif
#ifdef USE_LIBESMTP
#include <gnutls/gnutls.h>
#endif
-#ifdef CRYPT_BACKEND_GPGME
#include <gpgme.h>
-#endif
#ifdef USE_SSL
#include <openssl/opensslv.h>
static void mutt_usage (void)
{
- puts (mutt_make_version (1));
+ puts (mutt_make_version());
puts
_("usage: madmutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f <file> ]\n\
char buf[STRING];
#endif
- puts (mutt_make_version (1));
+ puts (mutt_make_version());
puts (_(Notice));
uname (&uts);
printf (" %s\n",OPENSSL_VERSION_TEXT);
#endif
-#ifdef CRYPT_BACKEND_GPGME
printf (" gpgme %s\n", GPGME_VERSION);
-#endif
-
puts (_("Compile Options:"));
puts (
"-HAVE_REGCOMP "
#endif
"\n "
-#ifdef HAVE_COLOR
- "+HAVE_COLOR "
-#else
- "-HAVE_COLOR "
-#endif
#ifdef HAVE_START_COLOR
"+HAVE_START_COLOR "
#else
);
puts (
-#ifdef CRYPT_BACKEND_GPGME
"+CRYPT_BACKEND_GPGME "
-#else
- "-CRYPT_BACKEND_GPGME "
-#endif
"\n "
#ifdef ENABLE_NLS
"+ENABLE_NLS "
);
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"));
#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] = "";
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);
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)
char buf[LONG_STRING];
char *tempfile = NULL, *infile = NULL;
char *bodytext = NULL;
+ FILE *fout;
if (!option (OPTNOCURSES))
mutt_flushinp ();
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);
mutt_endwin (Errorbuf);
exit (1);
}
- }
- else
+ } else
#endif
if (!Incoming.len) {
mutt_endwin _("No incoming mailboxes defined.");
unset_option (OPTNEWS);
nntp_expand_path (folder, sizeof (folder),
&CurrentNewsSrv->conn->account);
- }
- else
+ } else
#endif
mutt_expand_path (folder, sizeof (folder));
mutt_endwin (Errorbuf);
}
+ luaM_shutdown();
exit (0);
}