projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use m_tempfile()
[apps/madmutt.git]
/
main.c
diff --git
a/main.c
b/main.c
index
1e512c5
..
b3d7e66
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-20,20
+20,17
@@
#include <sys/utsname.h>
#include <lib-sys/mutt_signal.h>
#include <sys/utsname.h>
#include <lib-sys/mutt_signal.h>
-
#include <lib-mime/mime.h>
#include <lib-mime/mime.h>
-
#include <lib-ui/curses.h>
#include <lib-ui/curses.h>
+#include <lib-crypt/crypt.h>
+#include <lib-mx/mx.h>
#include "mutt.h"
#include "alias.h"
#include "mutt.h"
#include "alias.h"
-#include "mx.h"
#include "buffy.h"
#include "sort.h"
#include "buffy.h"
#include "sort.h"
-#include <lib-crypt/crypt.h>
#include "keymap.h"
#include "mutt_idna.h"
#include "keymap.h"
#include "mutt_idna.h"
-#include "xterm.h"
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#ifdef HAVE_GETOPT_H
#include <getopt.h>
@@
-47,7
+44,7
@@
extern int optind;
#endif
#ifdef USE_NNTP
#endif
#ifdef USE_NNTP
-#include
"nntp/nntp.h"
+#include
<nntp/nntp.h>
#endif
#ifdef USE_LIBESMTP
#endif
#ifdef USE_LIBESMTP
@@
-470,14
+467,11
@@
int main (int argc, char **argv)
p_clear(Options, countof(Options));
p_clear(QuadOptions, countof(QuadOptions));
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
#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
#endif
+ )) >= 0)
switch (i) {
case 'A':
alias_queries = mutt_add_list (alias_queries, optarg);
switch (i) {
case 'A':
alias_queries = mutt_add_list (alias_queries, optarg);
@@
-747,7
+741,7
@@
int main (int argc, char **argv)
if (!option (OPTNOCURSES))
mutt_endwin (NULL);
perror (tempfile);
if (!option (OPTNOCURSES))
mutt_endwin (NULL);
perror (tempfile);
-
fclose (
fin);
+
m_fclose(&
fin);
p_delete(&tempfile);
exit (1);
}
p_delete(&tempfile);
exit (1);
}
@@
-755,9
+749,9
@@
int main (int argc, char **argv)
mutt_copy_stream (fin, fout);
else if (bodytext)
fputs (bodytext, fout);
mutt_copy_stream (fin, fout);
else if (bodytext)
fputs (bodytext, fout);
-
fclose (
fout);
+
m_fclose(&
fout);
if (fin && fin != stdin)
if (fin && fin != stdin)
-
fclose (
fin);
+
m_fclose(&
fin);
}
}
}
}
@@
-809,8
+803,7
@@
int main (int argc, char **argv)
mutt_endwin (Errorbuf);
exit (1);
}
mutt_endwin (Errorbuf);
exit (1);
}
- }
- else
+ } else
#endif
if (!Incoming.len) {
mutt_endwin _("No incoming mailboxes defined.");
#endif
if (!Incoming.len) {
mutt_endwin _("No incoming mailboxes defined.");
@@
-833,8
+826,7
@@
int main (int argc, char **argv)
unset_option (OPTNEWS);
nntp_expand_path (folder, sizeof (folder),
&CurrentNewsSrv->conn->account);
unset_option (OPTNEWS);
nntp_expand_path (folder, sizeof (folder),
&CurrentNewsSrv->conn->account);
- }
- else
+ } else
#endif
mutt_expand_path (folder, sizeof (folder));
#endif
mutt_expand_path (folder, sizeof (folder));
@@
-861,7
+853,7
@@
int main (int argc, char **argv)
|| !explicit_folder) {
mutt_index_menu ();
if (option (OPTXTERMSETTITLES))
|| !explicit_folder) {
mutt_index_menu ();
if (option (OPTXTERMSETTITLES))
-
mutt_xterm_set_title (NONULL
(XtermLeave));
+
printf("\033]2;%s\007", NONULL
(XtermLeave));
if (Context)
p_delete(&Context);
}
if (Context)
p_delete(&Context);
}