projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
"gpg-sign" is not a valid token, this was a typo.
[apps/madmutt.git]
/
lib-mime
/
rfc1524.c
diff --git
a/lib-mime/rfc1524.c
b/lib-mime/rfc1524.c
index
de7ec11
..
39e46e6
100644
(file)
--- a/
lib-mime/rfc1524.c
+++ b/
lib-mime/rfc1524.c
@@
-35,19
+35,6
@@
* rfc1524.
*/
* rfc1524.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <errno.h>
-#include <unistd.h>
-
#include <lib-lib/lib-lib.h>
#include <lib-sys/unix.h>
#include <lib-lib/lib-lib.h>
#include <lib-sys/unix.h>
@@
-351,7
+338,7
@@
rfc1524_mailcap_parse(BODY *a, const char *filename, const char *type,
rfc1524_entry_init(entry);
}
} /* while (!found && (buf = mutt_read_line ())) */
rfc1524_entry_init(entry);
}
} /* while (!found && (buf = mutt_read_line ())) */
-
fclose (
fp);
+
m_fclose(&
fp);
error:
p_delete(&buf);
error:
p_delete(&buf);
@@
-450,9
+437,8
@@
int rfc1524_expand_filename (char *nametemplate,
m_strcpy(newfile, nflen, oldfile);
}
else if (!oldfile) {
m_strcpy(newfile, nflen, oldfile);
}
else if (!oldfile) {
- mutt_expand_fmt (newfile, nflen, nametemplate, "mutt");
- }
- else { /* oldfile && nametemplate */
+ m_file_fmt(newfile, nflen, nametemplate, "mutt");
+ } else { /* oldfile && nametemplate */
/* first, compare everything left from the "%s"
/* first, compare everything left from the "%s"