* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <lib-lib/macros.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/file.h>
+#include <lib-lib/lib-lib.h>
+#include <lib-ui/curses.h>
#include "mutt.h"
+#include "alias.h"
#include <lib-crypt/crypt.h>
#include "mutt_idna.h"
-#include "lib/debug.h"
-
-#include <sys/stat.h>
-#include <string.h>
-#include <ctype.h>
-
void mutt_edit_headers (const char *editor,
const char *body,
- HEADER * msg, char *fcc, size_t fcclen)
+ HEADER * msg, char *fcc, ssize_t fcclen)
{
char path[_POSIX_PATH_MAX]; /* tempfile used to edit headers + body */
char buffer[LONG_STRING];
ENVELOPE *n;
time_t mtime;
struct stat st;
- LIST *cur, **last = NULL, *tmp;
+ string_list_t *cur, **last = NULL, *tmp;
- mutt_mktemp (path);
- if ((ofp = safe_fopen (path, "w")) == NULL) {
+ ofp = m_tempfile(path, sizeof(path), NONULL(Tempdir), NULL);
+ if (!ofp) {
mutt_perror (path);
return;
}
mutt_copy_stream (ifp, ofp);
- fclose (ifp);
- fclose (ofp);
+ m_fclose(&ifp);
+ m_fclose(&ofp);
if (stat (path, &st) == -1) {
mutt_perror (path);
return;
}
- mtime = mutt_decrease_mtime (path, &st);
+ mtime = m_decrease_mtime(path, &st);
mutt_edit_file (editor, path);
stat (path, &st);
if (mtime == st.st_mtime) {
- debug_print (1, ("temp file was not modified.\n"));
/* the file has not changed! */
mutt_unlink (path);
return;
}
mutt_unlink (body);
- mutt_free_list (&msg->env->userhdrs);
+ string_list_wipe(&msg->env->userhdrs);
/* Read the temp file back in */
if ((ifp = fopen (path, "r")) == NULL) {
if ((ofp = safe_fopen (body, "w")) == NULL) {
/* intentionally leak a possible temporary file here */
- fclose (ifp);
+ m_fclose(&ifp);
mutt_perror (body);
return;
}
n = mutt_read_rfc822_header (ifp, NULL, 1, 0);
while ((i = fread (buffer, 1, sizeof (buffer), ifp)) > 0)
fwrite (buffer, 1, i, ofp);
- fclose (ofp);
- fclose (ifp);
+ m_fclose(&ofp);
+ m_fclose(&ifp);
mutt_unlink (path);
/* restore old info. */
n->references = msg->env->references;
msg->env->references = NULL;
- mutt_free_envelope (&msg->env);
+ envelope_delete(&msg->env);
msg->env = n;
n = NULL;
#ifdef USE_NNTP
if (!option (OPTNEWSSEND))
#endif
- mutt_free_list (&msg->env->references);
+ string_list_wipe(&msg->env->references);
mutt_expand_aliases_env (msg->env);
*last = cur->next;
cur = cur->next;
tmp->next = NULL;
- mutt_free_list (&tmp);
+ string_list_wipe(&tmp);
}
}
}