uip/mhshowsbr.c: Increase buffer size for showing-content command.

[nmh] / uip / mhstoresbr.c

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index d59172110525ecb7026b3a47d35503ebb281084b..2bc78ceb948f43fdcfdc8e9baf23a305b5be5f06 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -10,9 +10,13 @@
 #include <h/md5.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/md5.h>
 #include <h/mts.h>
 #include <h/tws.h>

+#include <h/fmt_scan.h>

 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>

+#include "mhshowsbr.h"
+#include "../sbr/m_maildir.h"
+#include "../sbr/m_mktemp.h"

 
 enum clobber_policy_t {
   NMH_CLOBBER_ALWAYS = 0,
 
 enum clobber_policy_t {
   NMH_CLOBBER_ALWAYS = 0,


@@ -364,20 +368,21 @@ store_partial (CT ct, mhstoreinfo_t info)
     for (ctq = base; *ctq; ctq++) {
        p = *ctq;
        pm = (struct partial *) p->c_ctparams;
     for (ctq = base; *ctq; ctq++) {
        p = *ctq;
        pm = (struct partial *) p->c_ctparams;

-       if (pm->pm_marked != cur) {
-           if (pm->pm_marked == cur - 1) {
-               inform("duplicate part %d of %d part multipart message, continuing...",
-                         pm->pm_marked, hi);
-               continue;
-           }
+       if (pm->pm_marked == cur) {
+           cur++;
+            continue;
+        }
+
+        if (pm->pm_marked == cur - 1) {
+            inform("duplicate part %d of %d part multipart message, continuing...",
+                      pm->pm_marked, hi);
+            continue;
+        }

 
 missing_part:
 
 missing_part:

-           inform("missing %spart %d of %d part multipart message",
-                cur != hi ? "(at least) " : "", cur, hi);
-           goto losing;
-       }
-        else
-           cur++;
+        inform("missing %spart %d of %d part multipart message",
+            cur != hi ? "(at least) " : "", cur, hi);
+        goto losing;

     }
     if (hi != --cur) {
        cur = hi;
     }
     if (hi != --cur) {
        cur = hi;


@@ -946,7 +951,9 @@ parse_format_string (CT ct, char *cp, char *buffer, int buflen, char *dir)
      * appropriate directory.
      */
     if (*cp != '/' && *cp != '|' && *cp != '!') {
      * appropriate directory.
      */
     if (*cp != '/' && *cp != '|' && *cp != '!') {

-       snprintf (bp, buflen, "%s/", dir[1] ? dir : "");
+        if (!strcmp(dir, "/"))
+            dir = ""; /* Don't start with "//". */
+       snprintf (bp, buflen, "%s/", dir);

        len = strlen (bp);
        bp += len;
        buflen -= len;
        len = strlen (bp);
        bp += len;
        buflen -= len;


@@ -967,7 +974,8 @@ parse_format_string (CT ct, char *cp, char *buffer, int buflen, char *dir)
                        *bp = '\0';
                        buflen--;
                        continue;
                        *bp = '\0';
                        buflen--;
                        continue;

-                   } else {
+                   }
+                    {

                        PM pm;
                        char *s = "";
 
                        PM pm;
                        char *s = "";