Handle the most common cases:
- compose and compose with $edit_headers
- postponed messages
- resend-message
- -H draft files via command line argument
- -i include body files via command line argument.
There are some other cases that are borderline where tempfiles should
go, but it's not easy to untangle when the code is shared between
multiple use-cases.
---
headers.c | 2 +-
main.c | 2 +-
postpone.c | 2 +-
send.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/headers.c b/headers.c
index dbec2f1d..09202742 100644
--- a/headers.c
+++ b/headers.c
@@ -47,7 +47,7 @@ int mutt_edit_headers (const char *editor,
if (flags != MUTT_EDIT_HEADERS_RESUME)
{
sctx->tempfile = mutt_buffer_new ();
- mutt_buffer_mktemp (sctx->tempfile);
+ mutt_buffer_mktemp_draft (sctx->tempfile);
if ((ofp = safe_fopen (mutt_b2s (sctx->tempfile), "w")) == NULL)
{
mutt_perror (mutt_b2s (sctx->tempfile));
diff --git a/main.c b/main.c
index d4bc77d4..cb32f93e 100644
--- a/main.c
+++ b/main.c
@@ -1093,7 +1093,7 @@ int main (int argc, char **argv, char **environ)
if (!edit_infile)
{
tempfile = mutt_buffer_new ();
- mutt_buffer_mktemp (tempfile);
+ mutt_buffer_mktemp_draft (tempfile);
if ((fout = safe_fopen (mutt_b2s (tempfile), "w")) == NULL)
{
diff --git a/postpone.c b/postpone.c
index 44b31db7..4c38234a 100644
--- a/postpone.c
+++ b/postpone.c
@@ -729,7 +729,7 @@ int mutt_prepare_template (FILE *fp, CONTEXT *ctx, HEADER
*newhdr, HEADER *hdr,
mutt_delete_parameter ("x-mutt-noconv", &b->parameter);
}
- mutt_adv_mktemp (file);
+ mutt_adv_mktemp_draft (file);
if ((s.fpout = safe_fopen (mutt_b2s (file), "w")) == NULL)
goto bail;
diff --git a/send.c b/send.c
index 6658fe7d..bb267d03 100644
--- a/send.c
+++ b/send.c
@@ -1931,7 +1931,7 @@ static int send_message_setup (SEND_CONTEXT *sctx, const
char *tempfile,
if (!tempfile)
{
tmpbuffer = mutt_buffer_pool_get ();
- mutt_buffer_mktemp (tmpbuffer);
+ mutt_buffer_mktemp_draft (tmpbuffer);
tempfp = safe_fopen (mutt_b2s (tmpbuffer), "w+");
sctx->msg->content->filename = safe_strdup (mutt_b2s (tmpbuffer));
mutt_buffer_pool_release (&tmpbuffer);
--
2.53.0