Rename mutt_buffer_adv_mktemp()

Remove buffer prefix since all callers now use this version.

Co-authored-by: Richard Russon <rich@flatcap.org>

diff --git a/mutt_attach.c b/mutt_attach.c
index 02449aa71f57f246548972574b14ea83969a4d54..ec7607d665967b5c5255d7906945bd14b50585b8 100644 (file)
--- a/mutt_attach.c
+++ b/mutt_attach.c
@@ -492,7 +492,7 @@ int mutt_view_attachment(FILE *fp, struct Body *a, enum ViewAttachMode mode,
     {
       /* recv case */
       mutt_buffer_strcpy(pagerfile, a->filename);
-      mutt_buffer_adv_mktemp(pagerfile);
+      mutt_adv_mktemp(pagerfile);
     }
     else
       mutt_buffer_mktemp(pagerfile);

diff --git a/mutt_body.c b/mutt_body.c
index 9a77875331be43aa89f71d9033b6df7dda9c2cc2..29edda98582df791d784728715bd1d73c66a0d26 100644 (file)
--- a/mutt_body.c
+++ b/mutt_body.c
@@ -64,7 +64,7 @@ int mutt_body_copy(FILE *fp, struct Body **tgt, struct Body *src)
     use_disp = false;
   }
 
-  mutt_buffer_adv_mktemp(tmp);
+  mutt_adv_mktemp(tmp);
   if (mutt_save_attachment(fp, src, mutt_b2s(tmp), MUTT_SAVE_NO_FLAGS, NULL) == -1)
   {
     mutt_buffer_pool_release(&tmp);

diff --git a/muttlib.c b/muttlib.c
index 98dea42c5d0f524676a8a39810b3ef82d73bc3f5..3664499fd4925dde72df54a6df2b5a210e65bdd3 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -79,10 +79,14 @@ static const char *xdg_defaults[] = {
 };
 
 /**
- * mutt_buffer_adv_mktemp - Create a temporary file
+ * mutt_adv_mktemp - Create a temporary file
  * @param buf Buffer for the name
+ *
+ * Accept a "suggestion" for file name.  If that file exists, then
+ * construct one with unique name but keep any extension.
+ * This might fail, I guess.
  */
-void mutt_buffer_adv_mktemp(struct Buffer *buf)
+void mutt_adv_mktemp(struct Buffer *buf)
 {
   if (!(buf->data && buf->data[0]))
   {
@@ -112,41 +116,6 @@ void mutt_buffer_adv_mktemp(struct Buffer *buf)
   }
 }
 
-/**
- * mutt_adv_mktemp - Advanced mktemp(3)
- * @param buf    Buffer for result
- * @param buflen Length of buffer
- *
- * Modified by blong to accept a "suggestion" for file name.  If that file
- * exists, then construct one with unique name but keep any extension.  This
- * might fail, I guess.
- */
-void mutt_adv_mktemp(char *buf, size_t buflen)
-{
-  if (buf[0] == '\0')
-  {
-    mutt_mktemp(buf, buflen);
-  }
-  else
-  {
-    char prefix[PATH_MAX];
-    mutt_str_strfcpy(prefix, buf, sizeof(prefix));
-    mutt_file_sanitize_filename(prefix, true);
-    snprintf(buf, buflen, "%s/%s", NONULL(C_Tmpdir), prefix);
-    struct stat sb;
-    if ((lstat(buf, &sb) == -1) && (errno == ENOENT))
-      return;
-
-    char *suffix = strrchr(prefix, '.');
-    if (suffix)
-    {
-      *suffix = '\0';
-      suffix++;
-    }
-    mutt_mktemp_pfx_sfx(buf, buflen, prefix, suffix);
-  }
-}
-
 /**
  * mutt_expand_path - Create the canonical path
  * @param buf    Buffer with path

diff --git a/muttlib.h b/muttlib.h
index 398ba031a14d3ce8a038bcb2c7fb10aaab721ee5..7fc433f0220ec09297a8e48d1b447a2ed3b6c190 100644 (file)
--- a/muttlib.h
+++ b/muttlib.h
@@ -42,8 +42,7 @@ extern struct Regex *C_GecosMask;
 
 #define MUTT_RANDTAG_LEN 16
 
-void        mutt_adv_mktemp(char *s, size_t l);
-void        mutt_buffer_adv_mktemp (struct Buffer *buf);
+void        mutt_adv_mktemp(struct Buffer *buf);
 void        mutt_buffer_mktemp_full(struct Buffer *buf, const char *prefix, const char *suffix, const char *src, int line);
 void        mutt_buffer_expand_path(struct Buffer *buf);
 void        mutt_buffer_expand_path_regex(struct Buffer *buf, bool regex);

diff --git a/postpone.c b/postpone.c
index f5e69202851f4d632ad1696fbe2b3afd51a17b41..2a12e2cb149db7a3dbbce31748b797b00101a74e 100644 (file)
--- a/postpone.c
+++ b/postpone.c
@@ -719,7 +719,7 @@ int mutt_prepare_template(FILE *fp, struct Mailbox *m, struct Email *newhdr,
       mutt_param_delete(&b->parameter, "x-mutt-noconv");
     }
 
-    mutt_buffer_adv_mktemp(file);
+    mutt_adv_mktemp(file);
     s.fp_out = mutt_file_fopen(mutt_b2s(file), "w");
     if (!s.fp_out)
       goto bail;

diff --git a/rfc1524.c b/rfc1524.c
index 7c074263c658f8a8c37bd107fef9daa99c10eafe..179e00726eeb93fb2900ecb2c7905ec14e52b135 100644 (file)
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -629,7 +629,7 @@ int mutt_rfc1524_expand_filename(const char *nametemplate, const char *oldfile,
     }
   }
 
-  mutt_buffer_adv_mktemp(newfile);
+  mutt_adv_mktemp(newfile);
 
   if (rmatch && lmatch)
     return 0;