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
95c3ddf
..
a2805f8
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-22,7
+22,6
@@
#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"
@@
-48,7
+47,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_("\
@@
-568,7
+567,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':
@@
-697,10
+696,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)
@@
-744,7
+744,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?"),
@@
-804,7
+804,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];
@@
-883,13
+883,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
@@
-928,8
+928,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 */