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

[nmh] / uip / mhn.c

diff --git a/uip/mhn.c b/uip/mhn.c
index b2db30705c2ae8a388be65696a382b0d15f064e8..a3f10305b74d9e1367b2c97503e94a3ab809d15d 100644 (file)
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -29,12 +29,8 @@
     X("noheaders", 0, NHEADSW) \
     X("list", 0, LISTSW) \
     X("nolist", 0, NLISTSW) \
     X("noheaders", 0, NHEADSW) \
     X("list", 0, LISTSW) \
     X("nolist", 0, NLISTSW) \

-    X("pause", 0, PAUSESW) \
-    X("nopause", 0, NPAUSESW) \

     X("realsize", 0, SIZESW) \
     X("norealsize", 0, NSIZESW) \
     X("realsize", 0, SIZESW) \
     X("norealsize", 0, NSIZESW) \

-    X("serialonly", 0, SERIALSW) \
-    X("noserialonly", 0, NSERIALSW) \

     X("show", 0, SHOWSW) \
     X("noshow", 0, NSHOWSW) \
     X("store", 0, STORESW) \
     X("show", 0, SHOWSW) \
     X("noshow", 0, NSHOWSW) \
     X("store", 0, STORESW) \


@@ -65,8 +61,8 @@
      */                                        \
     X("build", -5, BUILDSW) \
     X("nobuild", -7, NBUILDSW) \
      */                                        \
     X("build", -5, BUILDSW) \
     X("nobuild", -7, NBUILDSW) \

-    X("rfc934mode", -10, RFC934SW) \
-    X("norfc934mode", -12, NRFC934SW) \
+    X("rfc934mode", 0, RFC934SW) \
+    X("norfc934mode", 0, NRFC934SW) \

 
 #define X(sw, minchars, id) id,
 DEFINE_SWITCH_ENUM(MHN);
 
 #define X(sw, minchars, id) id,
 DEFINE_SWITCH_ENUM(MHN);


@@ -77,9 +73,6 @@ DEFINE_SWITCH_ARRAY(MHN, switches);
 #undef X
 
 
 #undef X
 
 

-/* mhparse.c */
-extern char *tmp;      /* directory to place temp files */
-

 /* mhcachesbr.c */
 extern int rcachesw;
 extern int wcachesw;
 /* mhcachesbr.c */
 extern int rcachesw;
 extern int wcachesw;


@@ -87,17 +80,11 @@ extern char *cache_public;
 extern char *cache_private;
 
 /* mhshowsbr.c */
 extern char *cache_private;
 
 /* mhshowsbr.c */

-extern int pausesw;
-extern int serialsw;

 extern char *progsw;
 extern int nolist;
 extern int nomore;     /* flags for moreproc/header display */
 extern char *formsw;
 
 extern char *progsw;
 extern int nolist;
 extern int nomore;     /* flags for moreproc/header display */
 extern char *formsw;
 

-/* 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;


@@ -128,19 +115,10 @@ static int storesw = 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);
 

-/* mhshowsbr.c */
-void show_all_messages (CT *);
-
-/* mhlistsbr.c */
-void list_all_messages (CT *, int, int, int, int);
-
-/* mhstoresbr.c */
-void store_all_messages (CT *);
-

 /* mhcachesbr.c */
 void cache_all_messages (CT *);
 
 /* mhcachesbr.c */
 void cache_all_messages (CT *);
 


@@ -157,25 +135,21 @@ static void pipeser (int);
 int
 main (int argc, char **argv)
 {
 int
 main (int argc, char **argv)
 {

-    int sizesw = 1, headsw = 1;
+    int sizesw = 1, headsw = 1, autosw = 0;

     int msgnum, *icachesw;
     char *cp, *file = NULL, *folder = NULL;
     char *maildir, buf[100], **argp;
     char **arguments;
     int msgnum, *icachesw;
     char *cp, *file = NULL, *folder = NULL;
     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;

+    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;


@@ -255,20 +229,6 @@ do_cache:
                listsw = 0;
                continue;
 
                listsw = 0;
                continue;
 

-           case PAUSESW:
-               pausesw = 1;
-               continue;
-           case NPAUSESW:
-               pausesw = 0;
-               continue;
-
-           case SERIALSW:
-               serialsw = 1;
-               continue;
-           case NSERIALSW:
-               serialsw = 0;
-               continue;
-

            case SHOWSW:
                showsw = 1;
                continue;
            case SHOWSW:
                showsw = 1;
                continue;


@@ -317,8 +277,7 @@ do_cache:
            case FORMSW:
                if (!(cp = *argp++) || *cp == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
            case FORMSW:
                if (!(cp = *argp++) || *cp == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);

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

                formsw = getcpy (etcpath (cp));
                continue;
 
                formsw = getcpy (etcpath (cp));
                continue;
 


@@ -411,17 +370,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));


@@ -490,8 +439,7 @@ 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;
 
        if ((ct = parse_mime (file)))
        ctp = cts;
 
        if ((ct = parse_mime (file)))


@@ -523,8 +471,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++) {


@@ -575,13 +522,24 @@ do_cache:
      * List the message content
      */
     if (listsw)
      * List the message content
      */
     if (listsw)

-       list_all_messages (cts, headsw, sizesw, verbosw, debugsw);
+       list_all_messages (cts, headsw, sizesw, verbosw, debugsw, 0);

 
     /*
      * Store the message content
      */
 
     /*
      * Store the message content
      */

-    if (storesw)
-       store_all_messages (cts);
+    if (storesw) {
+       info = mhstoreinfo_create (cts, cwd, "always", autosw, verbosw);;
+       store_all_messages (info);
+       mhstoreinfo_free (info);
+    }
+
+    /* If reading from a folder, do some updating */
+    if (mp) {
+       context_replace (pfolder, folder);/* update current folder  */
+       seq_setcur (mp, mp->hghsel);      /* update current message */
+       seq_save (mp);                    /* synchronize sequences  */
+       context_save ();                  /* save the context file  */
+    }

 
     /*
      * Cache the message content
 
     /*
      * Cache the message content


@@ -593,23 +551,15 @@ do_cache:
      * Show the message content
      */
     if (showsw)
      * Show the message content
      */
     if (showsw)

-       show_all_messages (cts);
+       show_all_messages (cts, 0, 0, 0);

 
     /* 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;
 
     cts = NULL;
 

-    /* If reading from a folder, do some updating */
-    if (mp) {
-       context_replace (pfolder, folder);/* update current folder  */
-       seq_setcur (mp, mp->hghsel);      /* update current message */
-       seq_save (mp);                    /* synchronize sequences  */
-       context_save ();                  /* save the context file  */
-    }
-

     done (0);
     return 1;
 }
     done (0);
     return 1;
 }