Makefile.am: Alter long lists to be sorted, one entry per line.

[nmh] / uip / mhstoresbr.c

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index 5a6f630c15538dce2d708591bdc1e810c445194a..a651d01a7b56087ed1d837f199a124046f0d679d 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
@@ -343,7 +341,7 @@ store_partial (CT ct, mhstoreinfo_t info)
     }
 
     if (hi == 0) {
-       advise (NULL, "missing (at least) last part of multipart message");
+       inform("missing (at least) last part of multipart message");
        return NOTOK;
     }
 
@@ -366,22 +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) {
-               admonish (NULL,
-                         "duplicate part %d of %d part multipart message",
-                         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:
-           advise (NULL,
-                   "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;
@@ -584,7 +581,7 @@ store_content (CT ct, CT p, mhstoreinfo_t info)
            create_folder(m_mailpath(folder), 0, exit);
 
            /* Record the folder name */
-           ct->c_folder = add (folder, NULL);
+           ct->c_folder = mh_xstrdup(folder);
 
            if (cp[1])
                free (folder);
@@ -706,7 +703,7 @@ output_content_file (CT ct, int appending)
        int cc, fd;
 
        if (!ct->c_ceopenfnx) {
-           advise (NULL, "don't know how to decode part %s of message %s",
+           inform("don't know how to decode part %s of message %s",
                    ct->c_partno, ct->c_file);
            return NOTOK;
        }
@@ -905,7 +902,7 @@ output_content_folder (char *folder, char *filename)
        /* Link file into folder */
        msgnum = folder_addmsg (&mp, filename, 0, 0, 0, 0, NULL);
     } else {
-       advise (NULL, "unable to read folder %s", folder);
+       inform("unable to read folder %s", folder);
        return NOTOK;
     }
 
@@ -971,7 +968,8 @@ parse_format_string (CT ct, char *cp, char *buffer, int buflen, char *dir)
                        *bp = '\0';
                        buflen--;
                        continue;
-                   } else {
+                   }
+                    {
                        PM pm;
                        char *s = "";
 
@@ -998,7 +996,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;
@@ -1175,7 +1173,7 @@ next_version (char *file, enum clobber_policy_t clobber_policy) {
 
       default:
         /* Should never get here. */
-        advise (NULL, "will not overwrite %s, invalid clobber policy", buffer);
+        inform("will not overwrite %s, invalid clobber policy", buffer);
         free (buffer);
         return NULL;
     }
@@ -1196,7 +1194,7 @@ next_version (char *file, enum clobber_policy_t clobber_policy) {
   free (file);
 
   if (version >= max_versions) {
-    advise (NULL, "will not overwrite %s, too many versions", buffer);
+    inform("will not overwrite %s, too many versions", buffer);
     free (buffer);
     buffer = NULL;
   }
@@ -1278,7 +1276,7 @@ clobber_check (char *original_file, mhstoreinfo_t info) {
             free (prompt);
           } else {
             /* Overwrite, that's what nmh used to do.  And warn. */
-            advise (NULL, "-clobber ask but no tty, so overwrite %s", file);
+            inform("-clobber ask but no tty, so overwrite %s", file);
             break;
           }
 
@@ -1298,7 +1296,7 @@ clobber_check (char *original_file, mhstoreinfo_t info) {
                 file = NULL;
                 ++info->files_not_clobbered;
               } else {
-                TrimSuffixC(buf, '\n');
+                trim_suffix_c(buf, '\n');
               }
 
               free (file);
@@ -1322,7 +1320,7 @@ clobber_check (char *original_file, mhstoreinfo_t info) {
         if (stat (file, &st) == OK) {
           /* Keep count of files that would have been clobbered,
              and return that as process exit status. */
-          advise (NULL, "will not overwrite %s with -clobber never", file);
+          inform("will not overwrite %s with -clobber never", file);
           free (file);
           file = NULL;
           ++info->files_not_clobbered;