X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=headers.c;h=b083ded4b78071d81c4021a0d15b38640477787c;hp=8b69cc5d19278f1880d210cf7afae7070f8c703c;hb=e4704214cabdd0b6e10b27cff5e2194959559809;hpb=9ed7a487e3a922f2cbb222961c2c9710c3a65f91 diff --git a/headers.c b/headers.c index 8b69cc5..b083ded 100644 --- a/headers.c +++ b/headers.c @@ -8,16 +8,15 @@ */ #include -#include +#include #include "mutt.h" #include "alias.h" -#include +#include "crypt.h" #include "mutt_idna.h" -void mutt_edit_headers (const char *editor, - const char *body, - HEADER * msg, char *fcc, ssize_t fcclen) +void mutt_edit_headers(const char *body, + HEADER * msg, char *fcc, ssize_t fcclen) { char path[_POSIX_PATH_MAX]; /* tempfile used to edit headers + body */ char buffer[LONG_STRING]; @@ -29,14 +28,14 @@ void mutt_edit_headers (const char *editor, struct stat st; string_list_t *cur, **last = NULL, *tmp; - ofp = m_tempfile(path, sizeof(path), NONULL(Tempdir), NULL); + ofp = m_tempfile(path, sizeof(path), NONULL(mod_core.tmpdir), NULL); if (!ofp) { mutt_perror (path); return; } mutt_env_to_local (msg->env); - mutt_write_rfc822_header (ofp, msg->env, NULL, 1, 0); + mutt_write_rfc822_header (ofp, msg->env, NULL, 1); fputc ('\n', ofp); /* tie off the header. */ /* now copy the body of the message. */ @@ -55,9 +54,9 @@ void mutt_edit_headers (const char *editor, return; } - mtime = mutt_decrease_mtime (path, &st); + mtime = m_decrease_mtime(path, &st); - mutt_edit_file (editor, path); + mutt_edit_file(path); stat (path, &st); if (mtime == st.st_mtime) { /* the file has not changed! */ @@ -97,10 +96,7 @@ void mutt_edit_headers (const char *editor, n = NULL; if (!msg->env->in_reply_to) -#ifdef USE_NNTP - if (!option (OPTNEWSSEND)) -#endif - string_list_wipe(&msg->env->references); + string_list_wipe(&msg->env->references); mutt_expand_aliases_env (msg->env);