Use a dynamically-allocated buffer for character set conversion, and

[nmh] / uip / show.c

diff --git a/uip/show.c b/uip/show.c
index 2db32d7ee867902e57d8c69c0fc8e672c575bd44..acd08afb1bc9cbe1e4ae7a1e5475b6a49ed2e25e 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -2,8 +2,6 @@
 /*
  * show.c -- show/list messages
  *
 /*
  * show.c -- show/list messages
  *

- * $Id$
- *

  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.


@@ -13,50 +11,39 @@
 #include <h/mime.h>
 #include <h/utils.h>
 
 #include <h/mime.h>
 #include <h/utils.h>
 

-static struct swit switches[] = {
-#define CHECKMIMESW          0
-    { "checkmime", 0 },
-#define NOCHECKMIMESW        1
-    { "nocheckmime", 0 },
-#define        HEADSW               2
-    { "header", 0 },
-#define        NHEADSW              3
-    { "noheader", 0 },
-#define        FORMSW               4
-    { "form formfile", 0 },
-#define        PROGSW               5
-    { "moreproc program", 0 },
-#define        NPROGSW              6
-    { "nomoreproc", 0 },
-#define        LENSW                7
-    { "length lines", 0 },
-#define        WIDTHSW              8
-    { "width columns", 0 },
-#define        SHOWSW               9
-    { "showproc program", 0 },
-#define SHOWMIMESW          10
-    { "showmimeproc program", 0 },
-#define        NSHOWSW             11
-    { "noshowproc", 0 },
-#define        DRFTSW              12
-    { "draft", 0 },
-#define        FILESW              13
-    { "file file", -4 },               /* interface from showfile */
-#define VERSIONSW           14
-    { "version", 0 },
-#define        HELPSW              15
-    { "help", 0 },
-    { NULL, 0 }
-};
+#define SHOW_SWITCHES \
+    X("checkmime", 0, CHECKMIMESW) \
+    X("nocheckmime", 0, NOCHECKMIMESW) \
+    X("header", 0, HEADSW) \
+    X("noheader", 0, NHEADSW) \
+    X("form formfile", 0, FORMSW) \
+    X("moreproc program", 0, PROGSW) \
+    X("nomoreproc", 0, NPROGSW) \
+    X("length lines", 0, LENSW) \
+    X("width columns", 0, WIDTHSW) \
+    X("showproc program", 0, SHOWSW) \
+    X("showmimeproc program", 0, SHOWMIMESW) \
+    X("noshowproc", 0, NSHOWSW) \
+    X("draft", 0, DRFTSW) \
+    X("file file", -4, FILESW) /* interface from showfile */ \
+    X("fmtproc program", 0, FMTPROCSW) \
+    X("nofmtproc", 0, NFMTPROCSW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(SHOW);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(SHOW, switches);
+#undef X

 
 /*
  * static prototypes
  */
 static int is_nontext(char *);
 
 
 /*
  * static prototypes
  */
 static int is_nontext(char *);
 

-/* prototype from mhlsbr.c */
-int mhl (int, char **);
-

 #define        SHOW  0
 #define        NEXT  1
 #define        PREV  2
 #define        SHOW  0
 #define        NEXT  1
 #define        PREV  2


@@ -65,25 +52,20 @@ int mhl (int, char **);
 int
 main (int argc, char **argv)
 {
 int
 main (int argc, char **argv)
 {

-    int draftsw = 0, headersw = 1, msgp = 0;
+    int draftsw = 0, headersw = 1;

     int nshow = 0, checkmime = 1, mime;
     int nshow = 0, checkmime = 1, mime;

-    int vecp = 1, procp = 1, isdf = 0, mode = SHOW, msgnum;
-    char *cp, *maildir, *file = NULL, *folder = NULL, *proc;
+    int isdf = 0, mode = SHOW, msgnum;
+    char *cp, *maildir, *file = NULL, *folder = NULL, *proc, *program;

     char buf[BUFSIZ], **argp, **arguments;
     char buf[BUFSIZ], **argp, **arguments;

-    char *msgs[MAXARGS], *vec[MAXARGS];
-    struct msgs *mp;
-
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
+    struct msgs *mp = NULL;
+    struct msgs_array msgs = { 0, 0, NULL };
+    struct msgs_array vec = { 0, 0, NULL };

 
 

-    /* read user profile/context */
-    context_read();
+    if (nmh_init(argv[0], 1)) { return 1; }

 
 

-    if (!mh_strcasecmp (invo_name, "next")) {
+    if (!strcasecmp (invo_name, "next")) {

        mode = NEXT;
        mode = NEXT;

-    } else if (!mh_strcasecmp (invo_name, "prev")) {
+    } else if (!strcasecmp (invo_name, "prev")) {

        mode = PREV;
     }
     arguments = getarguments (invo_name, argc, argv, 1);
        mode = PREV;
     }
     arguments = getarguments (invo_name, argc, argv, 1);


@@ -97,7 +79,8 @@ main (int argc, char **argv)
                    done (1);
                case UNKWNSW: 
                case NPROGSW:
                    done (1);
                case UNKWNSW: 
                case NPROGSW:

-                   vec[vecp++] = --cp;
+               case NFMTPROCSW:
+                   app_msgarg(&vec, --cp);

                    continue;
 
                case HELPSW: 
                    continue;
 
                case HELPSW: 


@@ -105,10 +88,10 @@ main (int argc, char **argv)
                        "%s [+folder] %s[switches] [switches for showproc]",
                        invo_name, mode == SHOW ? "[msgs] ": "");
                    print_help (buf, switches, 1);
                        "%s [+folder] %s[switches] [switches for showproc]",
                        invo_name, mode == SHOW ? "[msgs] ": "");
                    print_help (buf, switches, 1);

-                   done (1);
+                   done (0);

                case VERSIONSW:
                    print_version(invo_name);
                case VERSIONSW:
                    print_version(invo_name);

-                   done (1);
+                   done (0);

 
                case DRFTSW: 
                    if (file)
 
                case DRFTSW: 
                    if (file)


@@ -138,19 +121,20 @@ usage:
                    continue;
 
                case FORMSW:
                    continue;
 
                case FORMSW:

-                   vec[vecp++] = --cp;
+                   app_msgarg(&vec, --cp);

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

-                   vec[vecp++] = getcpy (etcpath(cp));
+                   app_msgarg(&vec, getcpy (etcpath(cp)));

                    continue;
 
                case PROGSW:
                case LENSW:
                case WIDTHSW:
                    continue;
 
                case PROGSW:
                case LENSW:
                case WIDTHSW:

-                   vec[vecp++] = --cp;
+               case FMTPROCSW:
+                   app_msgarg(&vec, --cp);

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

-                   vec[vecp++] = cp;
+                   app_msgarg(&vec, cp);

                    continue;
 
                case SHOWSW: 
                    continue;
 
                case SHOWSW: 


@@ -184,41 +168,33 @@ usage:
            if (mode != SHOW)
                goto usage;
            else
            if (mode != SHOW)
                goto usage;
            else

-               msgs[msgp++] = cp;
+               app_msgarg(&msgs, cp);

        }
     }
        }
     }

-    procp = vecp;

 
     if (!context_find ("path"))
        free (path ("./", TFOLDER));
 
     if (draftsw || file) {
 
     if (!context_find ("path"))
        free (path ("./", TFOLDER));
 
     if (draftsw || file) {

-       if (msgp)
+       if (msgs.size)

            adios (NULL, "only one file at a time!");
            adios (NULL, "only one file at a time!");

-       vec[vecp++] = draftsw
-           ? getcpy (m_draft (folder, msgp ? msgs[0] : NULL, 1, &isdf))
-           : file;
-       goto go_to_it;
-    }
-
-#ifdef WHATNOW
-    if (!msgp && !folder && mode == SHOW && (cp = getenv ("mhdraft")) && *cp) {
-       draftsw++;
-       vec[vecp++] = cp;
+       if (draftsw)
+           app_msgarg(&vec, getcpy (m_draft (folder, NULL, 1, &isdf)));
+       else
+           app_msgarg(&vec, file);

        goto go_to_it;
     }
        goto go_to_it;
     }

-#endif /* WHATNOW */

 
 

-    if (!msgp) {
+    if (!msgs.size) {

        switch (mode) {
            case NEXT:
        switch (mode) {
            case NEXT:

-               msgs[msgp++] = "next";
+               app_msgarg(&msgs, "next");

                break;
            case PREV:
                break;
            case PREV:

-               msgs[msgp++] = "prev";
+               app_msgarg(&msgs, "prev");

                break;
            default:
                break;
            default:

-               msgs[msgp++] = "cur";
+               app_msgarg(&msgs, "cur");

                break;
        }
     }
                break;
        }
     }


@@ -231,7 +207,7 @@ usage:
        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,8 +215,8 @@ usage:
        adios (NULL, "no messages in %s", folder);
 
     /* parse all the message ranges/sequences and set SELECTED */
        adios (NULL, "no messages in %s", folder);
 
     /* parse all the message ranges/sequences and set SELECTED */

-    for (msgnum = 0; msgnum < msgp; msgnum++)
-       if (!m_convert (mp, msgs[msgnum]))
+    for (msgnum = 0; msgnum < msgs.size; msgnum++)
+       if (!m_convert (mp, msgs.msgs[msgnum]))

            done (1);
 
     /*
            done (1);
 
     /*


@@ -255,26 +231,21 @@ usage:
     seq_setprev (mp);          /* set the Previous-Sequence */
     seq_setunseen (mp, 1);     /* unset the Unseen-Sequence */
 
     seq_setprev (mp);          /* set the Previous-Sequence */
     seq_setunseen (mp, 1);     /* unset the Unseen-Sequence */
 

-    if (mp->numsel > MAXARGS - 2)
-       adios (NULL, "more than %d messages for show exec", MAXARGS - 2);
-

     for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++)
        if (is_selected(mp, msgnum))
     for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++)
        if (is_selected(mp, msgnum))

-           vec[vecp++] = getcpy (m_name (msgnum));
+           app_msgarg(&vec, getcpy (m_name (msgnum)));

 
     seq_setcur (mp, mp->hghsel);       /* update current message  */
     seq_save (mp);                     /* synchronize sequences   */
     context_replace (pfolder, folder); /* update current folder   */
     context_save ();                   /* save the context file   */
 
 
     seq_setcur (mp, mp->hghsel);       /* update current message  */
     seq_save (mp);                     /* synchronize sequences   */
     context_replace (pfolder, folder); /* update current folder   */
     context_save ();                   /* save the context file   */
 

-    if (headersw && vecp == 2)
-       printf ("(Message %s:%s)\n", folder, vec[1]);
+    if (headersw && vec.size == 1)
+       printf ("(Message %s:%s)\n", folder, vec.msgs[0]);

 
 go_to_it: ;
     fflush (stdout);
 
 
 go_to_it: ;
     fflush (stdout);
 

-    vec[vecp] = NULL;
-

     /*
      * Decide which "proc" to use
      */
     /*
      * Decide which "proc" to use
      */


@@ -283,7 +254,7 @@ go_to_it: ;
        proc = catproc;
     } else {
        /* check if any messages are non-text MIME messages */
        proc = catproc;
     } else {
        /* check if any messages are non-text MIME messages */

-       if (checkmime && !getenv ("NOMHNPROC")) {
+       if (checkmime) {

            if (!draftsw && !file) {
                /* loop through selected messages and check for MIME */
                for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++)
            if (!draftsw && !file) {
                /* loop through selected messages and check for MIME */
                for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++)


@@ -293,7 +264,7 @@ go_to_it: ;
                    }
            } else {
                /* check the file or draft for MIME */
                    }
            } else {
                /* check the file or draft for MIME */

-               if (is_nontext (vec[vecp - 1]))
+               if (is_nontext (vec.msgs[vec.size - 1]))

                    mime = 1;
            }
        }
                    mime = 1;
            }
        }


@@ -308,75 +279,35 @@ go_to_it: ;
     if (folder && !draftsw && !file)
        m_putenv ("mhfolder", folder);
 
     if (folder && !draftsw && !file)
        m_putenv ("mhfolder", folder);
 

-    /*
-     * For backward compatibility, if the "proc" is mhn,
-     * then add "-show" option.  Add "-file" if showing
-     * file or draft.
-     */

     if (strcmp (r1bindex (proc, '/'), "mhn") == 0) {
     if (strcmp (r1bindex (proc, '/'), "mhn") == 0) {

+       /* Add "-file" if showing file or draft, */

        if (draftsw || file) {
        if (draftsw || file) {

-           vec[vecp] = vec[vecp - 1];
-           vec[vecp - 1] = "-file";
-           vecp++;
+           app_msgarg(&vec, vec.msgs[vec.size - 1]);
+           vec.msgs[vec.size - 2] = "-file";

        }
        }

-       vec[vecp++] = "-show";
-       vec[vecp] = NULL;
-    }
-
-    /* If the "proc" is "mhshow", add "-file" if showing file or draft.
-     */
-    if (strcmp (r1bindex (proc, '/'), "mhshow") == 0 && (draftsw || file) ) {
-       vec[vecp] = vec[vecp - 1];
-       vec[vecp - 1] = "-file";
-       vec[++vecp] = NULL;
-    }
-
-    /*
-     * If "proc" is mhl, then run it internally
-     * rather than exec'ing it.
-     */
-    if (strcmp (r1bindex (proc, '/'), "mhl") == 0) {
-       vec[0] = "mhl";
-       mhl (vecp, vec);
+       /* and add -show for backward compatibility */
+       app_msgarg(&vec, "-show");
+    } else if (strcmp (r1bindex (proc, '/'), "mhshow") == 0) {
+       /* If "mhshow", add "-file" if showing file or draft. */
+       if (draftsw || file) {
+           app_msgarg(&vec, vec.msgs[vec.size - 1]);
+           vec.msgs[vec.size - 2] = "-file";
+       }
+    } else if (strcmp (r1bindex (proc, '/'), "mhl") == 0) {
+       /* If "mhl", then run it internally */
+       argsplit_insert(&vec, "mhl", &program);
+       app_msgarg(&vec, NULL);
+       mhl (vec.size, vec.msgs);

        done (0);
     }
 
        done (0);
     }
 

-    /*
-     * If you are not using a nmh command as your "proc", then
-     * add the path to the message names.  Currently, we are just
-     * checking for mhn here, since we've already taken care of mhl.
-     */
-    if (!strcmp (r1bindex (proc, '/'), "mhl")
-           && !draftsw
-           && !file
-           && chdir (maildir = concat (m_maildir (""), "/", NULL)) != NOTOK) {
-       mp->foldpath = concat (mp->foldpath, "/", NULL);
-       cp = ssequal (maildir, mp->foldpath)
-           ? mp->foldpath + strlen (maildir)
-           : mp->foldpath;
-       for (msgnum = procp; msgnum < vecp; msgnum++)
-           vec[msgnum] = concat (cp, vec[msgnum], NULL);
-    }
-
-    vec[0] = r1bindex (proc, '/');
-    execvp (proc, vec);
+    argsplit_insert(&vec, proc, &program);
+    app_msgarg(&vec, NULL);
+    execvp (program, vec.msgs);

     adios (proc, "unable to exec");
     return 0;  /* dead code to satisfy the compiler */
 }
 
     adios (proc, "unable to exec");
     return 0;  /* dead code to satisfy the compiler */
 }
 

-/*
- * Cheat:  we are loaded with adrparse, which wants a routine called
- * OfficialName().  We call adrparse:getm() with the correct arguments
- * to prevent OfficialName() from being called.  Hence, the following
- * is to keep the loader happy.
- */
-
-char *
-OfficialName (char *name)
-{
-    return name;
-}
-

 
 /*
  * Check if a message or file contains any non-text parts
 
 /*
  * Check if a message or file contains any non-text parts


@@ -385,35 +316,37 @@ static int
 is_nontext (char *msgnam)
 {
     int        result, state;
 is_nontext (char *msgnam)
 {
     int        result, state;

-    char *bp, *cp, *dp;
+    char *bp, *dp, *cp;

     char buf[BUFSIZ], name[NAMESZ];
     FILE *fp;
     char buf[BUFSIZ], name[NAMESZ];
     FILE *fp;

+    m_getfld_state_t gstate = 0;

 
     if ((fp = fopen (msgnam, "r")) == NULL)
        return 0;
 
 
     if ((fp = fopen (msgnam, "r")) == NULL)
        return 0;
 

-    for (state = FLD;;) {
-       switch (state = m_getfld (state, name, buf, sizeof(buf), fp)) {
+    for (;;) {
+       int bufsz = sizeof buf;
+       switch (state = m_getfld (&gstate, name, buf, &bufsz, fp)) {

        case FLD:
        case FLDPLUS:
        case FLD:
        case FLDPLUS:

-       case FLDEOF:

            /*
             * Check Content-Type field
             */
            /*
             * Check Content-Type field
             */

-           if (!mh_strcasecmp (name, TYPE_FIELD)) {
+           if (!strcasecmp (name, TYPE_FIELD)) {

                int passno;
                char c;
 
                cp = add (buf, NULL);
                while (state == FLDPLUS) {
                int passno;
                char c;
 
                cp = add (buf, NULL);
                while (state == FLDPLUS) {

-                   state = m_getfld (state, name, buf, sizeof(buf), fp);
+                   bufsz = sizeof buf;
+                   state = m_getfld (&gstate, name, buf, &bufsz, fp);

                    cp = add (buf, cp);
                }
                bp = cp;
                passno = 1;
 
 again:
                    cp = add (buf, cp);
                }
                bp = cp;
                passno = 1;
 
 again:

-               for (; isspace (*bp); bp++)
+               for (; isspace ((unsigned char) *bp); bp++)

                    continue;
                if (*bp == '(') {
                    int i;
                    continue;
                if (*bp == '(') {
                    int i;


@@ -455,20 +388,20 @@ invalid:
                if (!*bp)
                    goto invalid;
                if (passno > 1) {
                if (!*bp)
                    goto invalid;
                if (passno > 1) {

-                   if ((result = (mh_strcasecmp (bp, "plain") != 0)))
+                   if ((result = (strcasecmp (bp, "plain") != 0)))

                        goto out;
                    *dp = c;
                        goto out;
                    *dp = c;

-                   for (dp++; isspace (*dp); dp++)
+                   for (dp++; isspace ((unsigned char) *dp); dp++)

                        continue;
                    if (*dp) {
                        if ((result = !uprf (dp, "charset")))
                            goto out;
                        dp += sizeof("charset") - 1;
                        continue;
                    if (*dp) {
                        if ((result = !uprf (dp, "charset")))
                            goto out;
                        dp += sizeof("charset") - 1;

-                       while (isspace (*dp))
+                       while (isspace ((unsigned char) *dp))

                            dp++;
                        if (*dp++ != '=')
                            goto invalid;
                            dp++;
                        if (*dp++ != '=')
                            goto invalid;

-                       while (isspace (*dp))
+                       while (isspace ((unsigned char) *dp))

                            dp++;
                        if (*dp == '"') {
                            if ((bp = strchr(++dp, '"')))
                            dp++;
                        if (*dp == '"') {
                            if ((bp = strchr(++dp, '"')))


@@ -487,7 +420,7 @@ invalid:
                    /* Check the character set */
                    result = !check_charset (dp, strlen (dp));
                } else {
                    /* Check the character set */
                    result = !check_charset (dp, strlen (dp));
                } else {

-                   if (!(result = (mh_strcasecmp (bp, "text") != 0))) {
+                   if (!(result = (strcasecmp (bp, "text") != 0))) {

                        *dp = c;
                        bp = dp;
                        passno = 2;
                        *dp = c;
                        bp = dp;
                        passno = 2;


@@ -498,6 +431,7 @@ out:
                free (cp);
                if (result) {
                    fclose (fp);
                free (cp);
                if (result) {
                    fclose (fp);

+                   m_getfld_state_destroy (&gstate);

                    return result;
                }
                break;
                    return result;
                }
                break;


@@ -506,24 +440,26 @@ out:
            /*
             * Check Content-Transfer-Encoding field
             */
            /*
             * Check Content-Transfer-Encoding field
             */

-           if (!mh_strcasecmp (name, ENCODING_FIELD)) {
+           if (!strcasecmp (name, ENCODING_FIELD)) {

                cp = add (buf, NULL);
                while (state == FLDPLUS) {
                cp = add (buf, NULL);
                while (state == FLDPLUS) {

-                   state = m_getfld (state, name, buf, sizeof(buf), fp);
+                   bufsz = sizeof buf;
+                   state = m_getfld (&gstate, name, buf, &bufsz, fp);

                    cp = add (buf, cp);
                }
                    cp = add (buf, cp);
                }

-               for (bp = cp; isspace (*bp); bp++)
+               for (bp = cp; isspace ((unsigned char) *bp); bp++)

                    continue;
                    continue;

-               for (dp = bp; istoken (*dp); dp++)
+               for (dp = bp; istoken ((unsigned char) *dp); dp++)

                    continue;
                *dp = '\0';
                    continue;
                *dp = '\0';

-               result = (mh_strcasecmp (bp, "7bit")
-                      && mh_strcasecmp (bp, "8bit")
-                      && mh_strcasecmp (bp, "binary"));
+               result = (strcasecmp (bp, "7bit")
+                      && strcasecmp (bp, "8bit")
+                      && strcasecmp (bp, "binary"));

 
                free (cp);
                if (result) {
                    fclose (fp);
 
                free (cp);
                if (result) {
                    fclose (fp);

+                   m_getfld_state_destroy (&gstate);

                    return result;
                }
                break;
                    return result;
                }
                break;


@@ -533,8 +469,10 @@ out:
             * Just skip the rest of this header
             * field and go to next one.
             */
             * Just skip the rest of this header
             * field and go to next one.
             */

-           while (state == FLDPLUS)
-               state = m_getfld (state, name, buf, sizeof(buf), fp);
+           while (state == FLDPLUS) {
+               bufsz = sizeof buf;
+               state = m_getfld (&gstate, name, buf, &bufsz, fp);
+           }

            break;
 
            /*
            break;
 
            /*


@@ -543,6 +481,7 @@ out:
             */
        default:
            fclose (fp);
             */
        default:
            fclose (fp);

+           m_getfld_state_destroy (&gstate);

            return 0;
        }
     }
            return 0;
        }
     }