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

[nmh] / uip / mhstore.c

diff --git a/uip/mhstore.c b/uip/mhstore.c
index cd84aeefd29b1576450c10b006567339b29bf0d6..183fe7d4d138ca87ba7a9e81176f66f7101cd684 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -11,8 +11,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/md5.h>

-#include <errno.h>
-#include <signal.h>

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


@@ -28,8 +26,10 @@
     X("verbose", 0, VERBSW) \
     X("noverbose", 0, NVERBSW) \
     X("file file", 0, FILESW)          /* interface from show */ \
     X("verbose", 0, VERBSW) \
     X("noverbose", 0, NVERBSW) \
     X("file file", 0, FILESW)          /* interface from show */ \

+    X("outfile outfile", 0, OUTFILESW) \

     X("part number", 0, PARTSW) \
     X("type content", 0, TYPESW) \
     X("part number", 0, PARTSW) \
     X("type content", 0, TYPESW) \

+    X("prefer content", 0, PREFERSW) \

     X("rcache policy", 0, RCACHESW) \
     X("wcache policy", 0, WCACHESW) \
     X("version", 0, VERSIONSW) \
     X("rcache policy", 0, RCACHESW) \
     X("wcache policy", 0, WCACHESW) \
     X("version", 0, VERSIONSW) \


@@ -46,22 +46,12 @@ DEFINE_SWITCH_ARRAY(MHSTORE, switches);
 #undef X
 
 
 #undef X
 
 

-int save_clobber_policy (const char *);
-extern int files_not_clobbered;
-
-/* mhparse.c */
-extern char *tmp;      /* directory to place temp files */
-

 /* mhcachesbr.c */
 extern int rcachesw;
 extern int wcachesw;
 extern char *cache_public;
 extern char *cache_private;
 
 /* mhcachesbr.c */
 extern int rcachesw;
 extern int wcachesw;
 extern char *cache_public;
 extern char *cache_private;
 

-/* mhstoresbr.c */
-extern int autosw;
-extern char *cwd;      /* cache current working directory */
-

 /* mhmisc.c */
 extern int npart;
 extern int ntype;
 /* mhmisc.c */
 extern int npart;
 extern int ntype;


@@ -69,22 +59,22 @@ extern char *parts[NPARTS + 1];
 extern char *types[NTYPES + 1];
 extern int userrs;
 
 extern char *types[NTYPES + 1];
 extern int userrs;
 

-int debugsw = 0;
-int verbosw = 0;
+/* mhparse.c */
+extern char *preferred_types[];
+extern  char *preferred_subtypes[];
+extern int npreferred;

 
 #define        quitser pipeser
 
 /* mhparse.c */
 
 #define        quitser pipeser
 
 /* mhparse.c */

+int debugsw = 0;

 CT parse_mime (char *);
 
 /* mhmisc.c */
 CT parse_mime (char *);
 
 /* 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);
 

-/* mhstoresbr.c */
-void store_all_messages (CT *);
-

 /* mhfree.c */
 extern CT *cts;
 void freects_done (int) NORETURN;
 /* mhfree.c */
 extern CT *cts;
 void freects_done (int) NORETURN;


@@ -98,24 +88,23 @@ static void pipeser (int);
 int
 main (int argc, char **argv)
 {
 int
 main (int argc, char **argv)
 {

-    int msgnum, *icachesw;
-    char *cp, *file = NULL, *folder = NULL;
+    /* verbosw defaults to 1 for backward compatibility. */
+    int msgnum, *icachesw, autosw = 0, verbosw = 1;
+    const char *clobbersw = "always";
+    char *cp, *file = NULL, *outfile = NULL, *folder = NULL;

     char *maildir, buf[100], **argp;
     char **arguments;
     char *maildir, buf[100], **argp;
     char **arguments;

+    char *cwd;

     struct msgs_array msgs = { 0, 0, NULL };
     struct msgs *mp = NULL;
     CT ct, *ctp;
     FILE *fp;
     struct msgs_array msgs = { 0, 0, NULL };
     struct msgs *mp = NULL;
     CT ct, *ctp;
     FILE *fp;

+    int files_not_clobbered;
+    mhstoreinfo_t info;

 
 

-    done=freects_done;
-
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
+    if (nmh_init(argv[0], 1)) { return 1; }

 
 

-    /* read user profile/context */
-    context_read();
+    done=freects_done;

 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;


@@ -126,13 +115,13 @@ main (int argc, char **argv)
     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {
     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {

-           case AMBIGSW: 
+           case AMBIGSW:

                ambigsw (cp, switches);
                done (1);
                ambigsw (cp, switches);
                done (1);

-           case UNKWNSW: 
+           case UNKWNSW:

                adios (NULL, "-%s unknown", cp);
 
                adios (NULL, "-%s unknown", cp);
 

-           case HELPSW: 
+           case HELPSW:

                snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
                        invo_name);
                print_help (buf, switches, 1);
                snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
                        invo_name);
                print_help (buf, switches, 1);


@@ -192,25 +181,40 @@ do_cache:
                types[ntype++] = cp;
                continue;
 
                types[ntype++] = cp;
                continue;
 

+           case PREFERSW:
+               if (!(cp = *argp++) || *cp == '-')
+                   adios (NULL, "missing argument to %s", argp[-2]);
+               if (npreferred >= NPREFS)
+                   adios (NULL, "too many preferred types (starting with %s), %d max",
+                          cp, NPREFS);
+               preferred_types[npreferred] = cp;
+               cp = strchr(cp, '/');
+               if (cp) *cp++ = '\0';
+               preferred_subtypes[npreferred++] = cp;
+               continue;
+

            case FILESW:
                if (!(cp = *argp++) || (*cp == '-' && cp[1]))
                    adios (NULL, "missing argument to %s", argp[-2]);
                file = *cp == '-' ? cp : path (cp, TFILE);
                continue;
 
            case FILESW:
                if (!(cp = *argp++) || (*cp == '-' && cp[1]))
                    adios (NULL, "missing argument to %s", argp[-2]);
                file = *cp == '-' ? cp : path (cp, TFILE);
                continue;
 

-           case VERBSW: 
+           case OUTFILESW:
+               if (!(cp = *argp++) || (*cp == '-' && cp[1]))
+                   adios (NULL, "missing argument to %s", argp[-2]);
+               outfile = *cp == '-' ? cp : path (cp, TFILE);
+               continue;
+
+           case VERBSW:

                verbosw = 1;
                continue;
                verbosw = 1;
                continue;

-           case NVERBSW: 
+           case NVERBSW:

                verbosw = 0;
                continue;
             case CLOBBERSW:
                if (!(cp = *argp++) || *cp == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
                verbosw = 0;
                continue;
             case CLOBBERSW:
                if (!(cp = *argp++) || *cp == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);

-                if (save_clobber_policy (cp)) {
-                  adios (NULL, "invalid argument, %s, to %s", argp[-1],
-                         argp[-2]);
-                }
+               clobbersw = cp;

                continue;
            case DEBUGSW:
                debugsw = 1;
                continue;
            case DEBUGSW:
                debugsw = 1;


@@ -262,17 +266,7 @@ do_cache:
     /*
      * Cache the current directory before we do any chdirs()'s.
      */
     /*
      * Cache the current directory before we do any chdirs()'s.
      */

-    cwd = getcpy (pwd());
-
-    /*
-     * Check for storage directory.  If specified,
-     * then store temporary files there.  Else we
-     * store them in standard nmh directory.
-     */
-    if ((cp = context_find (nmhstorage)) && *cp)
-       tmp = concat (cp, "/", invo_name, NULL);
-    else
-       tmp = add (m_maildir (invo_name), NULL);
+    cwd = add(pwd(), NULL);

 
     if (!context_find ("path"))
        free (path ("./", TFOLDER));
 
     if (!context_find ("path"))
        free (path ("./", TFOLDER));


@@ -284,12 +278,15 @@ do_cache:
      * check if message is coming from file
      */
     if (file) {
      * check if message is coming from file
      */
     if (file) {

-       if (!(cts = (CT *) calloc ((size_t) 2, sizeof(*cts))))
-           adios (NULL, "out of memory");
+       cts = mh_xcalloc(2, sizeof *cts);

        ctp = cts;
 
        ctp = cts;
 

-       if ((ct = parse_mime (file)))
+       if ((ct = parse_mime (file))) {

            *ctp++ = ct;
            *ctp++ = ct;

+           if (outfile) {
+               ct->c_storage = add (outfile, NULL);
+           }
+        }

     } else {
        /*
         * message(s) are coming from a folder
     } else {
        /*
         * message(s) are coming from a folder


@@ -317,8 +314,7 @@ do_cache:
                done (1);
        seq_setprev (mp);       /* set the previous-sequence */
 
                done (1);
        seq_setprev (mp);       /* set the previous-sequence */
 

-       if (!(cts = (CT *) calloc ((size_t) (mp->numsel + 1), sizeof(*cts))))
-           adios (NULL, "out of memory");
+       cts = mh_xcalloc(mp->numsel + 1, sizeof *cts);

        ctp = cts;
 
        for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
        ctp = cts;
 
        for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {


@@ -326,8 +322,12 @@ do_cache:
                char *msgnam;
 
                msgnam = m_name (msgnum);
                char *msgnam;
 
                msgnam = m_name (msgnum);

-               if ((ct = parse_mime (msgnam)))
+               if ((ct = parse_mime (msgnam))) {

                    *ctp++ = ct;
                    *ctp++ = ct;

+                   if (outfile) {
+                       ct->c_storage = add (outfile, NULL);
+                   }
+                }

            }
        }
     }
            }
        }
     }


@@ -357,13 +357,16 @@ do_cache:
     /*
      * Store the message content
      */
     /*
      * Store the message content
      */

-    store_all_messages (cts);
+    info = mhstoreinfo_create (cts, cwd, clobbersw, autosw, verbosw);
+    store_all_messages (info);
+    files_not_clobbered = mhstoreinfo_files_not_clobbered(info);
+    mhstoreinfo_free(info);

 
     /* Now free all the structures for the content */
     for (ctp = cts; *ctp; ctp++)
        free_content (*ctp);
 
 
     /* Now free all the structures for the content */
     for (ctp = cts; *ctp; ctp++)
        free_content (*ctp);
 

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

     cts = NULL;
 
     /* If reading from a folder, do some updating */
     cts = NULL;
 
     /* If reading from a folder, do some updating */