Alter HasSuffixC()'s char * to be const.

[nmh] / uip / mhstoresbr.c

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index 78ceef52c2844a0103c77413370258882c8dfef3..9c38a588d2ffbec9fe84e3a3704411830db9fcf5 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -9,7 +9,6 @@
 
 #include <h/mh.h>
 #include <fcntl.h>
 
 #include <h/mh.h>
 #include <fcntl.h>

-#include <h/signals.h>

 #include <h/md5.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/md5.h>
 #include <h/mts.h>
 #include <h/tws.h>


@@ -41,12 +40,11 @@ struct mhstoreinfo {
     enum clobber_policy_t clobber_policy;  /* -clobber selection */
 };
 
     enum clobber_policy_t clobber_policy;  /* -clobber selection */
 };
 

-typedef struct mhstoreinfo *mhstoreinfo_t;
-

 mhstoreinfo_t
 mhstoreinfo_create (CT *ct, char *pwd, const char *csw, int asw, int vsw) {
 mhstoreinfo_t
 mhstoreinfo_create (CT *ct, char *pwd, const char *csw, int asw, int vsw) {

-    mhstoreinfo_t info = mh_xmalloc (sizeof *info);
+    mhstoreinfo_t info;

 
 

+    NEW(info);

     info->cts = ct;
     info->cwd = pwd;
     info->autosw = asw;
     info->cts = ct;
     info->cwd = pwd;
     info->autosw = asw;


@@ -61,6 +59,7 @@ mhstoreinfo_create (CT *ct, char *pwd, const char *csw, int asw, int vsw) {
 void
 mhstoreinfo_free (mhstoreinfo_t info) {
     free (info->cwd);
 void
 mhstoreinfo_free (mhstoreinfo_t info) {
     free (info->cwd);

+    free (info->dir);

     free (info);
 }
 
     free (info);
 }
 


@@ -78,18 +77,10 @@ typedef int (*qsort_comp) (const void *, const void *);
 
 
 /* mhmisc.c */
 
 
 /* mhmisc.c */

-int part_ok (CT, int);
+int part_ok (CT);

 int type_ok (CT, int);
 void flush_errors (void);
 
 int type_ok (CT, int);
 void flush_errors (void);
 

-/* mhshowsbr.c */
-int show_content_aux (CT, int, int, char *, char *);
-
-/*
- * prototypes
- */
-void store_all_messages (mhstoreinfo_t);
-

 /*
  * static prototypes
  */
 /*
  * static prototypes
  */


@@ -125,7 +116,7 @@ store_all_messages (mhstoreinfo_t info)
      * store any contents.
      */
     if ((cp = context_find (nmhstorage)) && *cp)
      * store any contents.
      */
     if ((cp = context_find (nmhstorage)) && *cp)

-       info->dir = getcpy (cp);
+       info->dir = mh_xstrdup(cp);

     else
        info->dir = getcpy (info->cwd);
 
     else
        info->dir = getcpy (info->cwd);
 


@@ -296,15 +287,14 @@ store_multi (CT ct, mhstoreinfo_t info)
     for (part = m->mp_parts; part; part = part->mp_next) {
        CT  p = part->mp_part;
 
     for (part = m->mp_parts; part; part = part->mp_next) {
        CT  p = part->mp_part;
 

-       if (part_ok (p, 1) && type_ok (p, 1)) {
+       if (part_ok (p) && type_ok (p, 1)) {

            if (ct->c_storage) {
                /* Support mhstore -outfile.  The MIME parser doesn't
                   load c_storage, so we know that p->c_storage is
                   NULL here. */
            if (ct->c_storage) {
                /* Support mhstore -outfile.  The MIME parser doesn't
                   load c_storage, so we know that p->c_storage is
                   NULL here. */

-               p->c_storage = ct->c_storage;
+               p->c_storage = add (ct->c_storage, NULL);

            }
            result = store_switch (p, info);
            }
            result = store_switch (p, info);

-           p->c_storage = NULL;

 
            if (result == OK && ct->c_subtype == MULTI_ALTERNATE)
                break;
 
            if (result == OK && ct->c_subtype == MULTI_ALTERNATE)
                break;


@@ -355,9 +345,7 @@ store_partial (CT ct, mhstoreinfo_t info)
        return NOTOK;
     }
 
        return NOTOK;
     }
 

-    if ((base = (CT *) calloc ((size_t) (i + 1), sizeof(*base))) == NULL)
-       adios (NULL, "out of memory");
-
+    base = mh_xcalloc(i + 1, sizeof *base);

     ctq = base;
     for (ctp = info->cts; *ctp; ctp++) {
        p = *ctp;
     ctq = base;
     for (ctp = info->cts; *ctp; ctp++) {
        p = *ctp;


@@ -407,7 +395,7 @@ missing_part:
     ct = *ctq++;
     if (store_content (ct, NULL, info) == NOTOK) {
 losing:
     ct = *ctq++;
     if (store_content (ct, NULL, info) == NOTOK) {
 losing:

-       free ((char *) base);
+       free(base);

        return NOTOK;
     }
 
        return NOTOK;
     }
 


@@ -417,7 +405,7 @@ losing:
            goto losing;
     }
 
            goto losing;
     }
 

-    free ((char *) base);
+    free(base);

     return OK;
 }
 
     return OK;
 }
 


@@ -468,10 +456,9 @@ store_external (CT ct, mhstoreinfo_t info)
     if (ct->c_storage) {
        /* Support mhstore -outfile.  The MIME parser doesn't load
           c_storage, so we know that p->c_storage is NULL here. */
     if (ct->c_storage) {
        /* Support mhstore -outfile.  The MIME parser doesn't load
           c_storage, so we know that p->c_storage is NULL here. */

-       p->c_storage = ct->c_storage;
+       p->c_storage = add (ct->c_storage, NULL);

     }
     result = store_switch (p, info);
     }
     result = store_switch (p, info);

-    p->c_storage = NULL;

 
     p->c_partno = NULL;
     return result;
 
     p->c_partno = NULL;
     return result;


@@ -569,13 +556,9 @@ store_content (CT ct, CT p, mhstoreinfo_t info)
     if ((cp = ct->c_storeproc) == NULL || *cp == '\0') {
        CI ci = &ct->c_ctinfo;
 
     if ((cp = ct->c_storeproc) == NULL || *cp == '\0') {
        CI ci = &ct->c_ctinfo;
 

-       snprintf (buffer, sizeof(buffer), "%s-store-%s/%s",
-               invo_name, ci->ci_type, ci->ci_subtype);
-       if ((cp = context_find (buffer)) == NULL || *cp == '\0') {
-           snprintf (buffer, sizeof(buffer), "%s-store-%s", invo_name, ci->ci_type);
-           if ((cp = context_find (buffer)) == NULL || *cp == '\0') {
-               cp = ct->c_type == CT_MESSAGE ? "+" : "%m%P.%s";
-           }
+       cp = context_find_by_type ("store", ci->ci_type, ci->ci_subtype);
+       if (cp == NULL) {
+           cp = ct->c_type == CT_MESSAGE ? "+" : "%m%P.%s";

        }
     }
 
        }
     }
 


@@ -623,7 +606,7 @@ store_content (CT ct, CT p, mhstoreinfo_t info)
         * content to standard input of a command and return.
         */
        if (buffer[0] == '|' || buffer[0] == '!')
         * content to standard input of a command and return.
         */
        if (buffer[0] == '|' || buffer[0] == '!')

-           return show_content_aux (ct, 1, 0, buffer + 1, info->dir);
+           return show_content_aux (ct, 0, buffer + 1, info->dir, NULL);

 
         /* record the filename */
        if ((ct->c_storage = clobber_check (add (buffer, NULL), info)) ==
 
         /* record the filename */
        if ((ct->c_storage = clobber_check (add (buffer, NULL), info)) ==


@@ -632,7 +615,7 @@ store_content (CT ct, CT p, mhstoreinfo_t info)
        }
     } else {
        /* The output filename was explicitly specified, so use it. */
        }
     } else {
        /* The output filename was explicitly specified, so use it. */

-       if ((ct->c_storage = clobber_check (add (ct->c_storage, NULL), info)) ==
+       if ((ct->c_storage = clobber_check (ct->c_storage, info)) ==

            NULL) {
            return NOTOK;
        }
            NULL) {
            return NOTOK;
        }


@@ -790,7 +773,9 @@ losing:
                    break;
 
                default:
                    break;
 
                default:

-                   fwrite (buffer, sizeof(*buffer), cc, fp);
+                   if ((int) fwrite (buffer, sizeof(*buffer), cc, fp) < cc) {
+                       advise ("output_content_file", "fwrite");
+                   }

                    continue;
            }
            break;
                    continue;
            }
            break;


@@ -921,7 +906,7 @@ output_content_folder (char *folder, char *filename)
     /* Read the folder. */
     if ((mp = folder_read (folder, 0))) {
        /* Link file into folder */
     /* Read the folder. */
     if ((mp = folder_read (folder, 0))) {
        /* Link file into folder */

-       msgnum = folder_addmsg (&mp, filename, 0, 0, 0, 0, (char *)0);
+       msgnum = folder_addmsg (&mp, filename, 0, 0, 0, 0, NULL);

     } else {
        advise (NULL, "unable to read folder %s", folder);
        return NOTOK;
     } else {
        advise (NULL, "unable to read folder %s", folder);
        return NOTOK;


@@ -1093,8 +1078,7 @@ get_storeproc (CT ct)
                free(cp);
                return;
        }
                free(cp);
                return;
        }

-       if (cp)
-           free(cp);
+        mh_xfree(cp);

     }
 
     /*
     }
 
     /*


@@ -1112,8 +1096,7 @@ get_storeproc (CT ct)
            ct->c_storeproc = add (cp, NULL);
 
     }
            ct->c_storeproc = add (cp, NULL);
 
     }

-    if (cp)
-       free(cp);
+    mh_xfree(cp);

 }
 
 
 }
 
 


@@ -1153,19 +1136,22 @@ static
 enum clobber_policy_t
 clobber_policy (const char *value) {
   if (value == NULL  ||  ! strcasecmp (value, "always")) {
 enum clobber_policy_t
 clobber_policy (const char *value) {
   if (value == NULL  ||  ! strcasecmp (value, "always")) {

-  } else if (! strcasecmp (value, "auto")) {
+    return NMH_CLOBBER_ALWAYS;
+  }
+  if (! strcasecmp (value, "auto")) {

     return NMH_CLOBBER_AUTO;
     return NMH_CLOBBER_AUTO;

-  } else if (! strcasecmp (value, "suffix")) {
+  }
+  if (! strcasecmp (value, "suffix")) {

     return NMH_CLOBBER_SUFFIX;
     return NMH_CLOBBER_SUFFIX;

-  } else if (! strcasecmp (value, "ask")) {
+  }
+  if (! strcasecmp (value, "ask")) {

     return NMH_CLOBBER_ASK;
     return NMH_CLOBBER_ASK;

-  } else if (! strcasecmp (value, "never")) {
+  }
+  if (! strcasecmp (value, "never")) {

     return NMH_CLOBBER_NEVER;
     return NMH_CLOBBER_NEVER;

-  } else {
-    adios (NULL, "invalid argument, %s, to clobber", value);

   }
 
   }
 

-  return NMH_CLOBBER_ALWAYS;
+  adios (NULL, "invalid argument, %s, to clobber", value);

 }
 
 
 }
 
 


@@ -1245,6 +1231,10 @@ clobber_check (char *original_file, mhstoreinfo_t info) {
   char *cwd = NULL;
   int check_again;
 
   char *cwd = NULL;
   int check_again;
 

+  if (! strcmp (original_file, "-")) {
+      return original_file;
+  }
+

   if (info->clobber_policy == NMH_CLOBBER_ASK) {
     /* Save cwd for possible use in loop below. */
     char *slash;
   if (info->clobber_policy == NMH_CLOBBER_ASK) {
     /* Save cwd for possible use in loop below. */
     char *slash;


@@ -1255,7 +1245,9 @@ clobber_check (char *original_file, mhstoreinfo_t info) {
     if (slash) {
       *slash = '\0';
     } else {
     if (slash) {
       *slash = '\0';
     } else {

-      /* original_file wasn't a full path, which shouldn't happen. */
+      /* original_file isn't a full path, which should only happen if
+         it is -. */
+      free (cwd);

       cwd = NULL;
     }
   }
       cwd = NULL;
     }
   }


@@ -1293,7 +1285,7 @@ clobber_check (char *original_file, mhstoreinfo_t info) {
           if (isatty (fileno (stdin))) {
             char *prompt =
               concat ("Overwrite \"", file, "\" [y/n/rename]? ", NULL);
           if (isatty (fileno (stdin))) {
             char *prompt =
               concat ("Overwrite \"", file, "\" [y/n/rename]? ", NULL);

-            ans = getans (prompt, answer);
+            ans = read_switch_multiword (prompt, answer);

             free (prompt);
           } else {
             /* Overwrite, that's what nmh used to do.  And warn. */
             free (prompt);
           } else {
             /* Overwrite, that's what nmh used to do.  And warn. */


@@ -1317,10 +1309,7 @@ clobber_check (char *original_file, mhstoreinfo_t info) {
                 file = NULL;
                 ++info->files_not_clobbered;
               } else {
                 file = NULL;
                 ++info->files_not_clobbered;
               } else {

-                char *newline = strchr (buf, '\n');
-                if (newline) {
-                  *newline = '\0';
-                }
+                TrimSuffixC(buf, '\n');

               }
 
               free (file);
               }
 
               free (file);


@@ -1355,9 +1344,7 @@ clobber_check (char *original_file, mhstoreinfo_t info) {
     original_file = file;
   } while (check_again);
 
     original_file = file;
   } while (check_again);
 

-  if (cwd) {
-    free (cwd);
-  }
+  free (cwd);

 
   return file;
 }
 
   return file;
 }