#include "mutt.h"
#include "mutt_curses.h"
#include "keymap.h"
-#include "mailbox.h"
#include "url.h"
#include "mutt_crypt.h"
#include "mutt_idna.h"
#include "lib/mem.h"
#include "lib/intl.h"
#include "lib/str.h"
+#include "lib/debug.h"
#include <string.h>
#include <stdlib.h>
#endif
#ifdef USE_NNTP
-#include <nntp.h>
+#include "nntp/nntp.h"
#endif
static const char *ReachingUs = N_("\
Copyright (C) 1999-2002 Brendan Cully <brendan@kublai.com>\n\
Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n\
Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n\n\
-Parts were written/modified by:\n\
-Andreas Krennmair <ak@synflood.at>\n\
-Nico Golde <nico@ngolde.de>\n\
-Rocco Rutte <pdmef@cs.tu-berlin.de>\n\
+Copyright (C) 2005:\n\
+ Parts were written/modified by:\n\
+ Andreas Krennmair <ak@synflood.at>\n\
+ Nico Golde <nico@ngolde.de>\n\
+ Rocco Rutte <pdmef@cs.tu-berlin.de>\n\
\n\
Lots of others not mentioned here contributed lots of code,\n\
fixes, and suggestions.\n\
"+USE_INODESORT "
#else
"-USE_INODESORT "
+#endif
+#if USE_HCACHE
+ "+USE_HCACHE "
+#else
+ "-USE_HCACHE "
#endif
);
puts (
#else
"-USE_IMAP "
#endif
-#ifdef IMAP_EDIT_THREADS
- "+IMAP_EDIT_THREADS "
-#else
- "-IMAP_EDIT_THREADS "
-#endif
#ifdef USE_GSS
"+USE_GSS "
#else
#else
"-USE_GNUTLS "
#endif
-#ifdef USE_GNUTLS
- "+USE_GNUTLS "
-#else
- "-USE_GNUTLS "
-#endif
#ifdef USE_SASL
"+USE_SASL "
#else
#else
"-BUFFY_SIZE "
#endif
-#ifdef EXACT_ADDRESS
- "+EXACT_ADDRESS "
-#else
- "-EXACT_ADDRESS "
-#endif
#ifdef SUN_ATTACHMENT
"+SUN_ATTACHMENT "
#else
"+HAVE_GETADDRINFO "
#else
"-HAVE_GETADDRINFO "
-#endif
-#if USE_HCACHE
- "+USE_HCACHE "
-#else
- "-USE_HCACHE "
-#endif
-#if USE_HCACHE
- "+USE_HCACHE "
-#else
- "-USE_HCACHE "
#endif
);
puts (_(ReachingUs));
+ puts (_("Mutt-ng is based on the following patches written for mutt:\n"));
mutt_print_patchlist ();
exit (0);
break;
case 'F':
- mutt_str_replace (&Muttrc, optarg);
+ str_replace (&Muttrc, optarg);
break;
case 'f':
break;
case 'd':
+ debug_setlevel(atoi(optarg));
#ifdef DEBUG
- debuglevel = atoi (optarg);
- printf (_("Debugging at level %d.\n"), debuglevel);
+ printf (_("Debugging at level %d.\n"), atoi(optarg));
#else
printf _("DEBUG was not defined during compilation. Ignored.\n");
#endif
start_curses ();
/* set defaults and read init files */
+ mx_init ();
mutt_init (flags & M_NOSYSRC, commands);
mutt_free_list (&commands);
- /* Initialize crypto backends. */
+ /* Initialize crypto */
crypt_init ();
if (queries)
mutt_expand_path (fpath, sizeof (fpath));
#ifdef USE_IMAP
/* we're not connected yet - skip mail folder creation */
- if (!mx_is_imap (fpath))
+ if (mx_get_magic (fpath) != M_IMAP)
#endif
if (stat (fpath, &sb) == -1 && errno == ENOENT) {
snprintf (msg, sizeof (msg), _("%s does not exist. Create it?"),
if (infile || bodytext) {
if (infile) {
- if (mutt_strcmp ("-", infile) == 0)
+ if (safe_strcmp ("-", infile) == 0)
fin = stdin;
else {
char path[_POSIX_PATH_MAX];
}
else {
if (flags & M_BUFFY) {
- if (!mutt_buffy_check (0)) {
+ if (!buffy_check (0)) {
mutt_endwin _("No mailbox with new mail.");
exit (1);
}
folder[0] = 0;
- mutt_buffy (folder, sizeof (folder));
+ buffy_next (folder, sizeof (folder));
}
else if (flags & M_SELECT) {
#ifdef USE_NNTP
#endif
mutt_expand_path (folder, sizeof (folder));
- mutt_str_replace (&CurrentFolder, folder);
- mutt_str_replace (&LastFolder, folder);
+ str_replace (&CurrentFolder, folder);
+ str_replace (&LastFolder, folder);
if (flags & M_IGNORE) {
/* check to see if there are any messages in the folder */