uip: Replace some ints that are only ever 0 or 1 with bool.

[nmh] / uip / mhstoresbr.c

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index d707fb8eb124af98e01e498cdba553ac12925728..2b9448437182c88635fdc1339868e6d755615bae 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -14,8 +14,10 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
+#include "mhmisc.h"
 #include "mhshowsbr.h"
-#include "../sbr/m_mktemp.h"
+#include "sbr/m_maildir.h"
+#include "sbr/m_mktemp.h"
 
 enum clobber_policy_t {
   NMH_CLOBBER_ALWAYS = 0,
@@ -25,7 +27,7 @@ enum clobber_policy_t {
   NMH_CLOBBER_NEVER
 };
 
-static enum clobber_policy_t clobber_policy (const char *);
+static enum clobber_policy_t clobber_policy (const char *) PURE;
 
 struct mhstoreinfo {
     CT *cts;                 /* Top-level list of contents to store. */
@@ -79,11 +81,6 @@ mhstoreinfo_files_not_clobbered (const mhstoreinfo_t info) {
 typedef int (*qsort_comp) (const void *, const void *);
 
 
-/* mhmisc.c */
-int part_ok (CT);
-int type_ok (CT, int);
-void flush_errors (void);
-
 /*
  * static prototypes
  */
@@ -231,12 +228,14 @@ store_application (CT ct, mhstoreinfo_t info)
      * attribute/value pairs which specify if this a tar file.
      */
     if (!ct->c_storeproc && ct->c_subtype == APPLICATION_OCTETS) {
-       int tarP = 0, zP = 0, gzP = 0;
+       bool tarP = false;
+        bool zP = false;
+        bool gzP = false;
        char *cp;
 
        if ((cp = get_param(ci->ci_first_pm, "type", ' ', 1))) {
            if (strcasecmp (cp, "tar") == 0)
-               tarP = 1;
+               tarP = true;
        }
 
        /* check for "conversions=compress" attribute */
@@ -244,11 +243,11 @@ store_application (CT ct, mhstoreinfo_t info)
            (cp = get_param(ci->ci_first_pm, "x-conversions", ' ', 1))) {
            if (strcasecmp (cp, "compress") == 0 ||
                    strcasecmp (cp, "x-compress") == 0) {
-               zP = 1;
+               zP = true;
            }
            if (strcasecmp (cp, "gzip") == 0 ||
                    strcasecmp (cp, "x-gzip") == 0) {
-               gzP = 1;
+               gzP = true;
            }
        }
 
@@ -361,7 +360,7 @@ store_partial (CT ct, mhstoreinfo_t info)
     *ctq = NULL;
 
     if (i > 1)
-       qsort ((char *) base, i, sizeof(*base), (qsort_comp) ct_compar);
+       qsort(base, i, sizeof(*base), (qsort_comp) ct_compar);
 
     cur = 1;
     for (ctq = base; *ctq; ctq++) {
@@ -473,7 +472,7 @@ ct_compar (CT *a, CT *b)
     struct partial *am = (struct partial *) ((*a)->c_ctparams);
     struct partial *bm = (struct partial *) ((*b)->c_ctparams);
 
-    return (am->pm_marked - bm->pm_marked);
+    return am->pm_marked - bm->pm_marked;
 }
 
 
@@ -491,9 +490,11 @@ ct_compar (CT *a, CT *b)
 static int
 store_content (CT ct, CT p, mhstoreinfo_t info)
 {
-    int appending = 0, msgnum = 0;
-    int is_partial = 0, first_partial = 0;
-    int last_partial = 0;
+    bool appending = false;
+    int msgnum = 0;
+    bool is_partial = false;
+    bool first_partial = false;
+    bool last_partial = false;
     char *cp, buffer[BUFSIZ];
 
     /*
@@ -513,13 +514,13 @@ store_content (CT ct, CT p, mhstoreinfo_t info)
        struct partial *pm = (struct partial *) ct->c_ctparams;
 
        /* Yep, it's a message/partial */
-       is_partial = 1;
+       is_partial = true;
 
        /* But is it the first and/or last in the collection? */
        if (pm->pm_partno == 1)
-           first_partial = 1;
+           first_partial = true;
        if (pm->pm_maxno && pm->pm_partno == pm->pm_maxno)
-           last_partial = 1;
+           last_partial = true;
 
        /*
         * If "p" is a valid pointer, then it points to the
@@ -528,9 +529,9 @@ store_content (CT ct, CT p, mhstoreinfo_t info)
         * from the previous iteration of this function.
         */
        if (p) {
-           appending = 1;
+           appending = true;
             if (! ct->c_storage) {
-               ct->c_storage = add (p->c_storage, NULL);
+               ct->c_storage = mh_xstrdup(FENDNULL(p->c_storage));
 
                /* record the folder name */
                if (p->c_folder) {
@@ -569,7 +570,7 @@ store_content (CT ct, CT p, mhstoreinfo_t info)
 
            /* Store content in temporary file for now */
            if ((tmpfilenam = m_mktemp(invo_name, NULL, NULL)) == NULL) {
-               adios(NULL, "unable to create temporary file in %s",
+               die("unable to create temporary file in %s",
                      get_temp_dir());
            }
            ct->c_storage = mh_xstrdup(tmpfilenam);
@@ -785,7 +786,7 @@ losing:
 
        fclose (fp);
 
-       return (cc != NOTOK ? OK : NOTOK);
+        return cc == NOTOK ? NOTOK : OK;
     }
 
     if (!ct->c_fp && (ct->c_fp = fopen (ct->c_file, "r")) == NULL) {
@@ -901,13 +902,12 @@ output_content_folder (char *folder, char *filename)
     struct msgs *mp;
 
     /* Read the folder. */
-    if ((mp = folder_read (folder, 0))) {
-       /* Link file into folder */
-       msgnum = folder_addmsg (&mp, filename, 0, 0, 0, 0, NULL);
-    } else {
+    if (!(mp = folder_read(folder, 0))) {
        inform("unable to read folder %s", folder);
        return NOTOK;
     }
+    /* Link file into folder */
+    msgnum = folder_addmsg(&mp, filename, 0, 0, 0, 0, NULL);
 
     /* free folder structure */
     folder_free (mp);
@@ -1074,7 +1074,7 @@ get_storeproc (CT ct)
                free(cp);
                return;
        }
-        mh_xfree(cp);
+        free(cp);
     }
 
     /*
@@ -1088,7 +1088,7 @@ get_storeproc (CT ct)
            ct->c_storeproc = mh_xstrdup(cp);
 
     }
-    mh_xfree(cp);
+    free(cp);
 }
 
 
@@ -1143,7 +1143,7 @@ clobber_policy (const char *value) {
     return NMH_CLOBBER_NEVER;
   }
 
-  adios (NULL, "invalid argument, %s, to clobber", value);
+  die("invalid argument, %s, to clobber", value);
 }
 
 
@@ -1221,7 +1221,7 @@ clobber_check (char *original_file, mhstoreinfo_t info) {
 
   char *file;
   char *cwd = NULL;
-  int check_again;
+  bool check_again;
 
   if (! strcmp (original_file, "-")) {
       return original_file;
@@ -1248,7 +1248,7 @@ clobber_check (char *original_file, mhstoreinfo_t info) {
     struct stat st;
 
     file = original_file;
-    check_again = 0;
+    check_again = false;
 
     switch (info->clobber_policy) {
       case NMH_CLOBBER_ALWAYS:
@@ -1295,7 +1295,7 @@ clobber_check (char *original_file, mhstoreinfo_t info) {
               break;
             case NMH_RENAME: {
               char buf[PATH_MAX];
-              printf ("Enter filename or full path of the new file: ");
+              fputs("Enter filename or full path of the new file: ", stdout);
               if (fgets (buf, sizeof buf, stdin) == NULL  ||
                   buf[0] == '\0') {
                 file = NULL;
@@ -1314,7 +1314,7 @@ clobber_check (char *original_file, mhstoreinfo_t info) {
                 file = cwd  ?  concat (cwd, "/", buf, NULL)  :  mh_xstrdup(buf);
               }
 
-              check_again = 1;
+              check_again = true;
               break;
             }
           }