projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
main.c
diff --git
a/main.c
b/main.c
index
c774283
..
ce8c1be
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-22,11
+22,15
@@
#include "mutt.h"
#include "mutt_curses.h"
#include "keymap.h"
#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 "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>
#include <locale.h>
#include <string.h>
#include <stdlib.h>
#include <locale.h>
@@
-44,7
+48,7
@@
#endif
#ifdef USE_NNTP
#endif
#ifdef USE_NNTP
-#include
<nntp.h>
+#include
"nntp/nntp.h"
#endif
static const char *ReachingUs = N_("\
#endif
static const char *ReachingUs = N_("\
@@
-69,6
+73,7
@@
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\
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\
\n\
Lots of others not mentioned here contributed lots of code,\n\
fixes, and suggestions.\n\
@@
-222,6
+227,11
@@
static void show_version (void)
"+USE_INODESORT "
#else
"-USE_INODESORT "
"+USE_INODESORT "
#else
"-USE_INODESORT "
+#endif
+#if USE_HCACHE
+ "+USE_HCACHE "
+#else
+ "-USE_HCACHE "
#endif
);
puts (
#endif
);
puts (
@@
-240,11
+250,6
@@
static void show_version (void)
#else
"-USE_IMAP "
#endif
#else
"-USE_IMAP "
#endif
-#ifdef IMAP_EDIT_THREADS
- "+IMAP_EDIT_THREADS "
-#else
- "-IMAP_EDIT_THREADS "
-#endif
#ifdef USE_GSS
"+USE_GSS "
#else
#ifdef USE_GSS
"+USE_GSS "
#else
@@
-260,11
+265,6
@@
static void show_version (void)
#else
"-USE_GNUTLS "
#endif
#else
"-USE_GNUTLS "
#endif
-#ifdef USE_GNUTLS
- "+USE_GNUTLS "
-#else
- "-USE_GNUTLS "
-#endif
#ifdef USE_SASL
"+USE_SASL "
#else
#ifdef USE_SASL
"+USE_SASL "
#else
@@
-417,16
+417,6
@@
static void show_version (void)
"+HAVE_GETADDRINFO "
#else
"-HAVE_GETADDRINFO "
"+HAVE_GETADDRINFO "
#else
"-HAVE_GETADDRINFO "
-#endif
-#if USE_HCACHE
- "+USE_HCACHE "
-#else
- "-USE_HCACHE "
-#endif
-#if USE_HCACHE
- "+USE_HCACHE "
-#else
- "-USE_HCACHE "
#endif
);
#endif
);
@@
-449,6
+439,7
@@
static void show_version (void)
puts (_(ReachingUs));
puts (_(ReachingUs));
+ puts (_("Mutt-ng is based on the following patches written for mutt:\n"));
mutt_print_patchlist ();
exit (0);
mutt_print_patchlist ();
exit (0);
@@
-563,7
+554,7
@@
int main (int argc, char **argv)
break;
case 'F':
break;
case 'F':
-
mutt_
str_replace (&Muttrc, optarg);
+ str_replace (&Muttrc, optarg);
break;
case 'f':
break;
case 'f':
@@
-584,9
+575,9
@@
int main (int argc, char **argv)
break;
case 'd':
break;
case 'd':
+ debug_setlevel(atoi(optarg));
#ifdef DEBUG
#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
#else
printf _("DEBUG was not defined during compilation. Ignored.\n");
#endif
@@
-692,10
+683,11
@@
int main (int argc, char **argv)
start_curses ();
/* set defaults and read init files */
start_curses ();
/* set defaults and read init files */
+ mx_init ();
mutt_init (flags & M_NOSYSRC, commands);
mutt_free_list (&commands);
mutt_init (flags & M_NOSYSRC, commands);
mutt_free_list (&commands);
- /* Initialize crypto
backends.
*/
+ /* Initialize crypto */
crypt_init ();
if (queries)
crypt_init ();
if (queries)
@@
-739,7
+731,7
@@
int main (int argc, char **argv)
mutt_expand_path (fpath, sizeof (fpath));
#ifdef USE_IMAP
/* we're not connected yet - skip mail folder creation */
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?"),
#endif
if (stat (fpath, &sb) == -1 && errno == ENOENT) {
snprintf (msg, sizeof (msg), _("%s does not exist. Create it?"),
@@
-799,7
+791,7
@@
int main (int argc, char **argv)
if (infile || bodytext) {
if (infile) {
if (infile || bodytext) {
if (infile) {
- if (
mutt
_strcmp ("-", infile) == 0)
+ if (
safe
_strcmp ("-", infile) == 0)
fin = stdin;
else {
char path[_POSIX_PATH_MAX];
fin = stdin;
else {
char path[_POSIX_PATH_MAX];
@@
-878,13
+870,13
@@
int main (int argc, char **argv)
}
else {
if (flags & M_BUFFY) {
}
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_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
}
else if (flags & M_SELECT) {
#ifdef USE_NNTP
@@
-923,8
+915,8
@@
int main (int argc, char **argv)
#endif
mutt_expand_path (folder, sizeof (folder));
#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 */
if (flags & M_IGNORE) {
/* check to see if there are any messages in the folder */