Support iCalendar event request files that don't end with a newline.

[nmh] / uip / mhstoresbr.c

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index 9c1c79053b3d5d458ad098bb7246a0aed5f53b29..b836c07c37b73b869e22778967197273220ec253 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -1,6 +1,4 @@
-
-/*
- * mhstoresbr.c -- routines to save/store the contents of MIME messages
+/* mhstoresbr.c -- routines to save/store the contents of MIME messages
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -366,20 +364,21 @@ store_partial (CT ct, mhstoreinfo_t info)
     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:
-           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;
@@ -948,7 +947,9 @@ parse_format_string (CT ct, char *cp, char *buffer, int buflen, char *dir)
      * 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;
@@ -969,7 +970,8 @@ parse_format_string (CT ct, char *cp, char *buffer, int buflen, char *dir)
                        *bp = '\0';
                        buflen--;
                        continue;
-                   } else {
+                   }
+                    {
                        PM pm;
                        char *s = "";
 
@@ -996,7 +998,7 @@ parse_format_string (CT ct, char *cp, char *buffer, int buflen, char *dir)
                    break;
 
                case 'p':
-                   /* insert part number withouth leading dot */
+                   /* insert part number without leading dot */
                    if (ct->c_partno)
                        strncpy (bp, ct->c_partno, buflen);
                    break;