From: Kevin McCarthy <kevin@8t8.us>
Date: Sun, 7 Oct 2018 22:31:40 +0000 (-0700)
Subject: Convert maildir_parse_dir to use BUFFER.
X-Git-Tag: mutt-1-11-rel~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de6d61809244c41fc32e81ae69aeefefd252864f;p=mutt

Convert maildir_parse_dir to use BUFFER.

Note: the uses of buf and tmp don't overlap, so we only use a single
BUFFER.
---

diff --git a/mh.c b/mh.c
index cda81fe8..79718073 100644
--- a/mh.c
+++ b/mh.c
@@ -810,21 +810,26 @@ static int maildir_parse_dir (CONTEXT * ctx, struct maildir ***last,
 {
   DIR *dirp;
   struct dirent *de;
-  char buf[_POSIX_PATH_MAX];
-  int is_old = 0;
+  BUFFER *buf = NULL;
+  int rc = 0, is_old = 0;
   struct maildir *entry;
   HEADER *h;
 
+  buf = mutt_buffer_pool_get ();
+
   if (subdir)
   {
-    snprintf (buf, sizeof (buf), "%s/%s", ctx->path, subdir);
+    mutt_buffer_printf (buf, "%s/%s", ctx->path, subdir);
     is_old = (mutt_strcmp ("cur", subdir) == 0);
   }
   else
-    strfcpy (buf, ctx->path, sizeof (buf));
+    mutt_buffer_strcpy (buf, ctx->path);
 
-  if ((dirp = opendir (buf)) == NULL)
-    return -1;
+  if ((dirp = opendir (mutt_b2s (buf))) == NULL)
+  {
+    rc = -1;
+    goto cleanup;
+  }
 
   while ((de = readdir (dirp)) != NULL)
   {
@@ -851,9 +856,8 @@ static int maildir_parse_dir (CONTEXT * ctx, struct maildir ***last,
 
     if (subdir)
     {
-      char tmp[_POSIX_PATH_MAX];
-      snprintf (tmp, sizeof (tmp), "%s/%s", subdir, de->d_name);
-      h->path = safe_strdup (tmp);
+      mutt_buffer_printf (buf, "%s/%s", subdir, de->d_name);
+      h->path = safe_strdup (mutt_b2s (buf));
     }
     else
       h->path = safe_strdup (de->d_name);
@@ -869,7 +873,10 @@ static int maildir_parse_dir (CONTEXT * ctx, struct maildir ***last,
 
   closedir (dirp);
 
-  return 0;
+cleanup:
+  mutt_buffer_pool_release (&buf);
+
+  return rc;
 }
 
 static int maildir_add_to_context (CONTEXT * ctx, struct maildir *md)