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

[nmh] / uip / scan.c

diff --git a/uip/scan.c b/uip/scan.c
index f49aa60fe7e8a30a52ef110d7bb1f600102a814f..e971f55379c762f32d850449df0df8f0da351230 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -13,57 +13,38 @@
 #include <h/tws.h>
 #include <h/mts.h>
 #include <h/utils.h>
 #include <h/tws.h>
 #include <h/mts.h>
 #include <h/utils.h>

-#include <errno.h>
-
-static struct swit switches[] = {
-#define        CLRSW   0
-    { "clear", 0 },
-#define        NCLRSW  1
-    { "noclear", 0 },
-#define        FORMSW  2
-    { "form formatfile", 0 },
-#define        FMTSW   3
-    { "format string", 5 },
-#define        HEADSW  4
-    { "header", 0 },
-#define        NHEADSW 5
-    { "noheader", 0 },
-#define        WIDTHSW 6
-    { "width columns", 0 },
-#define        REVSW   7
-    { "reverse", 0 },
-#define        NREVSW  8
-    { "noreverse", 0 },
-#define        FILESW  9
-    { "file file", 4 },
-#define VERSIONSW 10
-    { "version", 0 },
-#define        HELPSW  11
-    { "help", 0 },
-    { NULL, 0 }
-};

 
 

-
-/*
- * global for sbr/formatsbr.c - yech!
- */
-#ifdef LBL
-extern struct msgs *fmt_current_folder;        
-#endif
-
-/*
- * prototypes
- */
-void clear_screen(void);  /* from termsbr.c */
+#define SCAN_SWITCHES \
+    X("clear", 0, CLRSW) \
+    X("noclear", 0, NCLRSW) \
+    X("form formatfile", 0, FORMSW) \
+    X("format string", 5, FMTSW) \
+    X("header", 0, HEADSW) \
+    X("noheader", 0, NHEADSW) \
+    X("width columns", 0, WIDTHSW) \
+    X("reverse", 0, REVSW) \
+    X("noreverse", 0, NREVSW) \
+    X("file file", 4, FILESW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(SCAN);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(SCAN, switches);
+#undef X

 
 
 int
 main (int argc, char **argv)
 {
     int clearflag = 0, hdrflag = 0, ontty;
 
 
 int
 main (int argc, char **argv)
 {
     int clearflag = 0, hdrflag = 0, ontty;

-    int width = 0, revflag = 0;
+    int width = -1, revflag = 0;

     int i, state, msgnum;
     int i, state, msgnum;

-    int seqnum[NUMATTRS], unseen, num_unseen_seq = 0;
+    ivector_t seqnum = ivector_create (0);
+    int unseen, num_unseen_seq = 0;

     char *cp, *maildir, *file = NULL, *folder = NULL;
     char *form = NULL, *format = NULL, buf[BUFSIZ];
     char **argp, *nfs, **arguments;
     char *cp, *maildir, *file = NULL, *folder = NULL;
     char *form = NULL, *format = NULL, buf[BUFSIZ];
     char **argp, *nfs, **arguments;


@@ -71,15 +52,9 @@ main (int argc, char **argv)
     struct msgs *mp;
     FILE *in;
 
     struct msgs *mp;
     FILE *in;
 

-#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();
-
-    mts_init (invo_name);
+    mts_init ();

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


@@ -184,19 +159,21 @@ main (int argc, char **argv)
                adios (file, "unable to open");
        }
 
                adios (file, "unable to open");
        }
 

-#ifndef        JLR

        if (hdrflag) {
            printf ("FOLDER %s\t%s\n", file, dtimenow (1));
        }
        if (hdrflag) {
            printf ("FOLDER %s\t%s\n", file, dtimenow (1));
        }

-#endif /* JLR */

 
 

-       m_unknown (in);
+       scan_detect_mbox_style (in);

        for (msgnum = 1; ; ++msgnum) {
        for (msgnum = 1; ; ++msgnum) {

+           charstring_t scanl = NULL;
+

            state = scan (in, msgnum, -1, nfs, width, 0, 0,
            state = scan (in, msgnum, -1, nfs, width, 0, 0,

-                   hdrflag ? file : NULL, 0L, 1);
+                         hdrflag ? file : NULL, 0L, 1, &scanl);
+           charstring_free (scanl);

            if (state != SCNMSG && state != SCNENC)
                break;
        }
            if (state != SCNMSG && state != SCNENC)
                break;
        }

+       scan_finished ();

        fclose (in);
        done (0);
     }
        fclose (in);
        done (0);
     }


@@ -215,7 +192,7 @@ main (int argc, char **argv)
        adios (maildir, "unable to change directory to");
 
     /* read folder and create message structure */
        adios (maildir, "unable to change directory to");
 
     /* read folder and create message structure */

-    if (!(mp = folder_read (folder)))
+    if (!(mp = folder_read (folder, 1)))

        adios (NULL, "unable to read folder %s", folder);
 
     /* check for empty folder */
        adios (NULL, "unable to read folder %s", folder);
 
     /* check for empty folder */


@@ -239,44 +216,31 @@ main (int argc, char **argv)
     if ((cp = context_find (usequence)) && *cp) {
        char **ap, *dp;
 
     if ((cp = context_find (usequence)) && *cp) {
        char **ap, *dp;
 

-       dp = getcpy(cp);
+       dp = mh_xstrdup(cp);

        ap = brkstring (dp, " ", "\n");
        for (i = 0; ap && *ap; i++, ap++)
        ap = brkstring (dp, " ", "\n");
        for (i = 0; ap && *ap; i++, ap++)

-           seqnum[i] = seq_getnum (mp, *ap);
+           ivector_push_back (seqnum, seq_getnum (mp, *ap));

 
        num_unseen_seq = i;
 
        num_unseen_seq = i;

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

     }
 
     ontty = isatty (fileno (stdout));
 
     }
 
     ontty = isatty (fileno (stdout));
 

-#ifdef LBL
-    else
-       fmt_current_folder = mp;
-#endif
-

     for (msgnum = revflag ? mp->hghsel : mp->lowsel;
         (revflag ? msgnum >= mp->lowsel : msgnum <= mp->hghsel);
         msgnum += (revflag ? -1 : 1)) {
        if (is_selected(mp, msgnum)) {
     for (msgnum = revflag ? mp->hghsel : mp->lowsel;
         (revflag ? msgnum >= mp->lowsel : msgnum <= mp->hghsel);
         msgnum += (revflag ? -1 : 1)) {
        if (is_selected(mp, msgnum)) {

+           charstring_t scanl = NULL;
+

            if ((in = fopen (cp = m_name (msgnum), "r")) == NULL) {
            if ((in = fopen (cp = m_name (msgnum), "r")) == NULL) {

-#if 0
-               if (errno != EACCES)
-#endif

                    admonish (cp, "unable to open message");
                    admonish (cp, "unable to open message");

-#if 0
-               else
-                   printf ("%*d  unreadable\n", DMAXFOLDER, msgnum);
-#endif

                continue;
            }
 
                continue;
            }
 

-#ifndef JLR

            if (hdrflag) {
                printf ("FOLDER %s\t%s\n", folder, dtimenow(1));
            }
            if (hdrflag) {
                printf ("FOLDER %s\t%s\n", folder, dtimenow(1));
            }

-#endif /* JLR */

 
            /*
             * Check if message is in any sequence given
 
            /*
             * Check if message is in any sequence given


@@ -284,7 +248,7 @@ main (int argc, char **argv)
             */
            unseen = 0;
            for (i = 0; i < num_unseen_seq; i++) {
             */
            unseen = 0;
            for (i = 0; i < num_unseen_seq; i++) {

-               if (in_sequence(mp, seqnum[i], msgnum)) {
+               if (in_sequence(mp, ivector_at (seqnum, i), msgnum)) {

                    unseen = 1;
                    break;
                }
                    unseen = 1;
                    break;
                }


@@ -292,7 +256,7 @@ main (int argc, char **argv)
 
            switch (state = scan (in, msgnum, 0, nfs, width,
                        msgnum == mp->curmsg, unseen,
 
            switch (state = scan (in, msgnum, 0, nfs, width,
                        msgnum == mp->curmsg, unseen,

-                       folder, 0L, 1)) {
+                       folder, 0L, 1, &scanl)) {

                case SCNMSG: 
                case SCNENC: 
                case SCNERR: 
                case SCNMSG: 
                case SCNENC: 
                case SCNERR: 


@@ -302,13 +266,11 @@ main (int argc, char **argv)
                    adios (NULL, "scan() botch (%d)", state);
 
                case SCNEOF: 
                    adios (NULL, "scan() botch (%d)", state);
 
                case SCNEOF: 

-#if 0
-                   printf ("%*d  empty\n", DMAXFOLDER, msgnum);
-#else

                    advise (NULL, "message %d: empty", msgnum);
                    advise (NULL, "message %d: empty", msgnum);

-#endif

                    break;
            }
                    break;
            }

+           charstring_free (scanl);
+           scan_finished ();

            hdrflag = 0;
            fclose (in);
            if (ontty)
            hdrflag = 0;
            fclose (in);
            if (ontty)


@@ -316,13 +278,10 @@ main (int argc, char **argv)
        }
     }
 
        }
     }
 

-#ifdef LBL
-    seq_save (mp);     /* because formatsbr might have made changes */
-#endif
-
+    ivector_free (seqnum);

     folder_free (mp);  /* free folder/message structure */
     if (clearflag)
     folder_free (mp);  /* free folder/message structure */
     if (clearflag)

-       clear_screen ();
+       nmh_clear_screen ();

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