pidstatus.c: Move interface to own file.

[nmh] / uip / mhstoresbr.c

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index 64bddb6988f95c06386deb3456ac78e1ed4cc469..5d995492c217000e47bf718c99c75a6287897357 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -5,15 +5,17 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
+#include "h/mh.h"
+#include "sbr/path.h"
+#include "sbr/error.h"
 #include <fcntl.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/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 "mhmisc.h"
 #include "mhshowsbr.h"
 #include "sbr/m_maildir.h"
@@ -46,7 +48,8 @@ struct mhstoreinfo {
 static bool use_param_as_filename(const char *p);
 
 mhstoreinfo_t
-mhstoreinfo_create (CT *ct, char *pwd, const char *csw, int asw, int vsw) {
+mhstoreinfo_create (CT *ct, char *pwd, const char *csw, int asw, int vsw)
+{
     mhstoreinfo_t info;
 
     NEW(info);
@@ -62,14 +65,16 @@ mhstoreinfo_create (CT *ct, char *pwd, const char *csw, int asw, int vsw) {
 }
 
 void
-mhstoreinfo_free (mhstoreinfo_t info) {
+mhstoreinfo_free (mhstoreinfo_t info)
+{
     free (info->cwd);
     free (info->dir);
     free (info);
 }
 
 int
-mhstoreinfo_files_not_clobbered (const mhstoreinfo_t info) {
+mhstoreinfo_files_not_clobbered (const mhstoreinfo_t info)
+{
     return info->files_not_clobbered;
 }
 
@@ -228,12 +233,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 */
@@ -241,11 +248,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;
            }
        }
 
@@ -358,7 +365,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++) {
@@ -488,9 +495,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];
 
     /*
@@ -510,13 +519,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
@@ -525,7 +534,7 @@ 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 = mh_xstrdup(FENDNULL(p->c_storage));
 
@@ -566,7 +575,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);
@@ -1120,9 +1129,9 @@ copy_some_headers (FILE *out, CT ct)
 /******************************************************************************/
 /* -clobber support */
 
-static
-enum clobber_policy_t
-clobber_policy (const char *value) {
+static enum clobber_policy_t
+clobber_policy (const char *value)
+{
   if (value == NULL  ||  ! strcasecmp (value, "always")) {
     return NMH_CLOBBER_ALWAYS;
   }
@@ -1139,12 +1148,13 @@ clobber_policy (const char *value) {
     return NMH_CLOBBER_NEVER;
   }
 
-  adios (NULL, "invalid argument, %s, to clobber", value);
+  die("invalid argument, %s, to clobber", value);
 }
 
 
 static char *
-next_version (char *file, enum clobber_policy_t clobber_policy) {
+next_version (char *file, enum clobber_policy_t clobber_policy)
+{
   const size_t max_versions = 1000000;
   /* 8 = log max_versions  +  one for - or .  +  one for null terminator */
   const size_t buflen = strlen (file) + 8;
@@ -1205,7 +1215,8 @@ next_version (char *file, enum clobber_policy_t clobber_policy) {
 
 
 static char *
-clobber_check (char *original_file, mhstoreinfo_t info) {
+clobber_check (char *original_file, mhstoreinfo_t info)
+{
   /* clobber policy        return value
    * --------------        ------------
    *   -always             original_file
@@ -1217,7 +1228,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;
@@ -1244,7 +1255,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:
@@ -1291,7 +1302,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;
@@ -1310,7 +1321,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;
             }
           }
@@ -1337,7 +1348,8 @@ clobber_check (char *original_file, mhstoreinfo_t info) {
   return file;
 }
 
-static bool use_param_as_filename(const char *p)
+static bool
+use_param_as_filename(const char *p)
 {
     /* Preserve result of original test that considered an empty string
      * OK. */