Convert mutt_save_message() to use buffer pool

Change imap_copy_messages() dest parameter to const char *.

mutt_default_save() will be converted to use a buffer next, removing
the dptr fixups.

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

diff --git a/commands.c b/commands.c
index 5fbde2c3f2a861421b2f16c582c759606c065689..9f59c02e051bd8a810de97e5a6e618700892401c 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -1007,12 +1007,14 @@ int mutt_save_message(struct Mailbox *m, struct EmailList *el,
 
   bool need_passphrase = false;
   int app = 0;
-  char buf[PATH_MAX];
+  int rc = -1;
   const char *prompt = NULL;
   struct stat st;
   struct EmailNode *en = STAILQ_FIRST(el);
   bool single = !STAILQ_NEXT(en, entries);
 
+  struct Buffer *buf = mutt_buffer_pool_get();
+
   if (delete_original)
   {
     if (decode)
@@ -1038,67 +1040,70 @@ int mutt_save_message(struct Mailbox *m, struct EmailList *el,
     app = en->email->security;
   }
   mutt_message_hook(m, en->email, MUTT_MESSAGE_HOOK);
-  mutt_default_save(buf, sizeof(buf), en->email);
+  mutt_default_save(buf->data, buf->dsize, en->email);
+  mutt_buffer_fix_dptr(buf);
 
-  mutt_pretty_mailbox(buf, sizeof(buf));
-  if (mutt_enter_fname(prompt, buf, sizeof(buf), false) == -1)
-    return -1;
+  mutt_buffer_pretty_mailbox(buf);
+  if (mutt_enter_fname(prompt, buf->data, buf->dsize, 0) == -1)
+    goto cleanup;
+  mutt_buffer_fix_dptr(buf);
 
-  size_t pathlen = strlen(buf);
+  size_t pathlen = mutt_buffer_len(buf);
   if (pathlen == 0)
-    return -1;
+    goto cleanup;
 
   /* Trim any trailing '/' */
-  if (buf[pathlen - 1] == '/')
-    buf[pathlen - 1] = '\0';
+  if (buf->data[pathlen - 1] == '/')
+    buf->data[pathlen - 1] = '\0';
 
   /* This is an undocumented feature of ELM pointed out to me by Felix von
    * Leitner <leitner@prz.fu-berlin.de> */
-  if (mutt_str_strcmp(buf, ".") == 0)
-    mutt_str_strfcpy(buf, LastSaveFolder, sizeof(buf));
+  if (mutt_str_strcmp(mutt_b2s(buf), ".") == 0)
+    mutt_buffer_strcpy(buf, LastSaveFolder);
   else
-    mutt_str_strfcpy(LastSaveFolder, buf, sizeof(LastSaveFolder));
+    mutt_str_strfcpy(LastSaveFolder, mutt_b2s(buf), sizeof(LastSaveFolder));
 
-  mutt_expand_path(buf, sizeof(buf));
+  mutt_buffer_expand_path(buf);
 
   /* check to make sure that this file is really the one the user wants */
-  if (mutt_save_confirm(buf, &st) != 0)
-    return -1;
+  if (mutt_save_confirm(mutt_b2s(buf), &st) != 0)
+    goto cleanup;
 
   if ((WithCrypto != 0) && need_passphrase && (decode || decrypt) &&
       !crypt_valid_passphrase(app))
   {
-    return -1;
+    goto cleanup;
   }
 
-  mutt_message(_("Copying to %s..."), buf);
+  mutt_message(_("Copying to %s..."), mutt_b2s(buf));
 
 #ifdef USE_IMAP
   if ((m->magic == MUTT_IMAP) && !(decode || decrypt) &&
-      (imap_path_probe(buf, NULL) == MUTT_IMAP))
+      (imap_path_probe(mutt_b2s(buf), NULL) == MUTT_IMAP))
   {
-    switch (imap_copy_messages(m, el, buf, delete_original))
+    switch (imap_copy_messages(m, el, mutt_b2s(buf), delete_original))
     {
       /* success */
       case 0:
         mutt_clear_error();
-        return 0;
+        rc = 0;
+        goto cleanup;
       /* non-fatal error: continue to fetch/append */
       case 1:
         break;
       /* fatal error, abort */
       case -1:
-        return -1;
+        goto cleanup;
     }
   }
 #endif
 
-  struct Mailbox *m_save = mx_path_resolve(buf);
+  struct Mailbox *m_save = mx_path_resolve(mutt_b2s(buf));
   struct Context *ctx_save = mx_mbox_open(m_save, MUTT_NEWFOLDER);
   if (!ctx_save)
   {
     mailbox_free(&m_save);
-    return -1;
+    goto cleanup;
   }
   bool old_append = m_save->append;
   m_save->append = true;
@@ -1122,7 +1127,7 @@ int mutt_save_message(struct Mailbox *m, struct EmailList *el,
     {
       m_save->append = old_append;
       mx_mbox_close(&ctx_save);
-      return -1;
+      goto cleanup;
     }
 #ifdef USE_COMPRESSED
     if (m_comp)
@@ -1141,7 +1146,7 @@ int mutt_save_message(struct Mailbox *m, struct EmailList *el,
   }
   else
   {
-    int rc = 0;
+    rc = 0;
 
 #ifdef USE_NOTMUCH
     if (m->magic == MUTT_NOTMUCH)
@@ -1178,7 +1183,7 @@ int mutt_save_message(struct Mailbox *m, struct EmailList *el,
     {
       m_save->append = old_append;
       mx_mbox_close(&ctx_save);
-      return -1;
+      goto cleanup;
     }
   }
 
@@ -1189,10 +1194,14 @@ int mutt_save_message(struct Mailbox *m, struct EmailList *el,
   mx_mbox_close(&ctx_save);
 
   if (need_mailbox_cleanup)
-    mutt_mailbox_cleanup(buf, &st);
+    mutt_mailbox_cleanup(mutt_b2s(buf), &st);
 
   mutt_clear_error();
-  return 0;
+  rc = 0;
+
+cleanup:
+  mutt_buffer_pool_release(&buf);
+  return rc;
 }
 
 /**

diff --git a/imap/imap.h b/imap/imap.h
index d3c56535c4e7f6c1e7a0c2eb50f4d92954e7c268..5c6b6bf1c5e2f481b939f86fb4e463505b8caa73 100644 (file)
--- a/imap/imap.h
+++ b/imap/imap.h
@@ -101,7 +101,7 @@ int imap_mailbox_create(const char *folder);
 int imap_mailbox_rename(const char *path);
 
 /* message.c */
-int imap_copy_messages(struct Mailbox *m, struct EmailList *el, char *dest, bool delete_original);
+int imap_copy_messages(struct Mailbox *m, struct EmailList *el, const char *dest, bool delete_original);
 
 /* socket.c */
 void imap_logout_all(void);

diff --git a/imap/message.c b/imap/message.c
index 17d8401038da5f4fcbf62121dd052e2f63d0d742..b6e5b0e115967ef7e7c97a1dffcc0be684c99f15 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -1573,7 +1573,7 @@ fail:
  * @retval  0 Success
  * @retval  1 Non-fatal error - try fetch/append
  */
-int imap_copy_messages(struct Mailbox *m, struct EmailList *el, char *dest, bool delete_original)
+int imap_copy_messages(struct Mailbox *m, struct EmailList *el, const char *dest, bool delete_original)
 {
   if (!m || !el || !dest)
     return -1;