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_strncmp instead of strncmp
[apps/madmutt.git]
/
main.c
diff --git
a/main.c
b/main.c
index
d5e6cf8
..
9e2ef37
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-467,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);
@@
-675,6
+672,7
@@
int main (int argc, char **argv)
char buf[LONG_STRING];
char *tempfile = NULL, *infile = NULL;
char *bodytext = NULL;
char buf[LONG_STRING];
char *tempfile = NULL, *infile = NULL;
char *bodytext = NULL;
+ FILE *fout;
if (!option (OPTNOCURSES))
mutt_flushinp ();
if (!option (OPTNOCURSES))
mutt_flushinp ();
@@
-729,18
+727,16
@@
int main (int argc, char **argv)
else
fin = NULL;
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 (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(Tempdir), NULL);
+
tempfile = m_strdup(buf)
;
- if ((fout = safe_fopen (tempfile, "w")) == NULL) {
+ if (tempfile) {
+ if (!fout) {
if (!option (OPTNOCURSES))
mutt_endwin (NULL);
perror (tempfile);
if (!option (OPTNOCURSES))
mutt_endwin (NULL);
perror (tempfile);
@@
-806,8
+802,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.");
@@
-830,8
+825,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));