Escape literal leading full stop in man/new.man.

[nmh] / uip / show.c

diff --git a/uip/show.c b/uip/show.c
index 766aec947906f1a1dea3adeb7b5ba4add31dfe83..7fb4cfaea2840673e64ed9715cca275c352c0611 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -1,4 +1,3 @@
-

 /*
  * show.c -- show/list messages
  *
 /*
  * show.c -- show/list messages
  *


@@ -30,6 +29,20 @@
     X("nofmtproc", 0, NFMTPROCSW) \
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
     X("nofmtproc", 0, NFMTPROCSW) \
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \

+    /*                         \
+     * switches for mhlproc    \
+     */                                \
+    X("concat", 0, CONCATSW) \
+    X("noconcat", 0, NCONCATSW) \
+    /*                         \
+     * switches for mhshow     \
+     */                                \
+    X("part number", 0, PARTSW) \
+    X("type content", 0, TYPESW) \
+    X("prefer content", 0, PREFERSW) \
+    X("markform file", 0, MARKFORMSW) \
+    X("rcache policy", 0, RCACHESW) \
+    X("wcache policy", 0, WCACHESW) \

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


@@ -53,27 +66,19 @@ int
 main (int argc, char **argv)
 {
     int draftsw = 0, headersw = 1;
 main (int argc, char **argv)
 {
     int draftsw = 0, headersw = 1;

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

     int isdf = 0, mode = SHOW, msgnum;
     int isdf = 0, mode = SHOW, msgnum;

-    char *cp, *maildir, *file = NULL, *folder = NULL, *proc;
+    char *cp, *maildir, *file = NULL, *folder = NULL, *proc, *program;

     char buf[BUFSIZ], **argp, **arguments;
     struct msgs *mp = NULL;
     struct msgs_array msgs = { 0, 0, NULL };
     char buf[BUFSIZ], **argp, **arguments;
     struct msgs *mp = NULL;
     struct msgs_array msgs = { 0, 0, NULL };

-    struct msgs_array vec = { 0, 0, NULL };
-
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
-
-    app_msgarg(&vec, NULL);  /* placeholder, filled later with proc name */
+    struct msgs_array vec = { 0, 0, NULL }, non_mhl_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);


@@ -82,16 +87,30 @@ 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 HEADSW:
+                   headersw = 1;
+                   goto non_mhl_switches;
+               case NHEADSW:
+                   headersw = 0;
+                   /* FALLTHRU */
+               case CONCATSW:
+               case NCONCATSW:
+non_mhl_switches:
+                   /* mhl can't handle these, so keep them separate. */
+                   app_msgarg(&non_mhl_vec, --cp);
+                   continue;
+
+               case UNKWNSW:

                case NPROGSW:
                case NFMTPROCSW:
                    app_msgarg(&vec, --cp);
                    continue;
 
                case NPROGSW:
                case NFMTPROCSW:
                    app_msgarg(&vec, --cp);
                    continue;
 

-               case HELPSW: 
+               case HELPSW:

                    snprintf (buf, sizeof(buf),
                        "%s [+folder] %s[switches] [switches for showproc]",
                        invo_name, mode == SHOW ? "[msgs] ": "");
                    snprintf (buf, sizeof(buf),
                        "%s [+folder] %s[switches] [switches for showproc]",
                        invo_name, mode == SHOW ? "[msgs] ": "");


@@ -101,7 +120,7 @@ main (int argc, char **argv)
                    print_version(invo_name);
                    done (0);
 
                    print_version(invo_name);
                    done (0);
 

-               case DRFTSW: 
+               case DRFTSW:

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


@@ -111,7 +130,7 @@ usage:
                    adios (NULL,
                            "usage: %s [+folder] [switches] [switches for showproc]",
                            invo_name);
                    adios (NULL,
                            "usage: %s [+folder] [switches] [switches for showproc]",
                            invo_name);

-               case FILESW: 
+               case FILESW:

                    if (mode != SHOW)
                        goto usage;
                    if (draftsw || file)
                    if (mode != SHOW)
                        goto usage;
                    if (draftsw || file)


@@ -121,13 +140,6 @@ usage:
                    file = path (cp, TFILE);
                    continue;
 
                    file = path (cp, TFILE);
                    continue;
 

-               case HEADSW: 
-                   headersw++;
-                   continue;
-               case NHEADSW: 
-                   headersw = 0;
-                   continue;
-

                case FORMSW:
                    app_msgarg(&vec, --cp);
                    if (!(cp = *argp++) || *cp == '-')
                case FORMSW:
                    app_msgarg(&vec, --cp);
                    if (!(cp = *argp++) || *cp == '-')


@@ -139,18 +151,24 @@ usage:
                case LENSW:
                case WIDTHSW:
                case FMTPROCSW:
                case LENSW:
                case WIDTHSW:
                case FMTPROCSW:

+               case PARTSW:
+               case TYPESW:
+               case PREFERSW:
+               case MARKFORMSW:
+               case RCACHESW:
+               case WCACHESW:

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

-               case SHOWSW: 
+               case SHOWSW:

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

-               case NSHOWSW: 
+               case NSHOWSW:

                    nshow++;
                    continue;
 
                    nshow++;
                    continue;
 


@@ -175,8 +193,7 @@ usage:
        } else {
            if (mode != SHOW)
                goto usage;
        } else {
            if (mode != SHOW)
                goto usage;

-           else
-               app_msgarg(&msgs, cp);
+            app_msgarg(&msgs, cp);

        }
     }
 
        }
     }
 


@@ -190,17 +207,10 @@ usage:
            app_msgarg(&vec, getcpy (m_draft (folder, NULL, 1, &isdf)));
        else
            app_msgarg(&vec, file);
            app_msgarg(&vec, getcpy (m_draft (folder, NULL, 1, &isdf)));
        else
            app_msgarg(&vec, file);

+       headersw = 0;

        goto go_to_it;
     }
 
        goto go_to_it;
     }
 

-#ifdef WHATNOW
-    if (!msgs.size && !folder && mode == SHOW && (cp = getenv ("mhdraft")) && *cp) {
-       draftsw++;
-       app_msgarg(&vec, cp);
-       goto go_to_it;
-    }
-#endif /* WHATNOW */
-

     if (!msgs.size) {
        switch (mode) {
            case NEXT:
     if (!msgs.size) {
        switch (mode) {
            case NEXT:


@@ -223,7 +233,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 */


@@ -249,28 +259,23 @@ usage:
 
     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))

-           app_msgarg(&vec, getcpy (m_name (msgnum)));
+           app_msgarg(&vec, mh_xstrdup(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 && vec.size == 2)
-       printf ("(Message %s:%s)\n", folder, vec.msgs[1]);
-

 go_to_it: ;
 go_to_it: ;

-    fflush (stdout);

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

-    mime = 0;

     if (nshow) {
        proc = catproc;
     } else {
        /* check if any messages are non-text MIME messages */
     if (nshow) {
        proc = catproc;
     } else {
        /* check if any messages are non-text MIME messages */

-       if (checkmime) {
+       if (! mime  &&  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++)


@@ -295,31 +300,61 @@ go_to_it: ;
     if (folder && !draftsw && !file)
        m_putenv ("mhfolder", folder);
 
     if (folder && !draftsw && !file)
        m_putenv ("mhfolder", folder);
 

-    if (strcmp (r1bindex (proc, '/'), "mhn") == 0) {
-       /* Add "-file" if showing file or draft, */
-       if (draftsw || file) {
-           app_msgarg(&vec, vec.msgs[vec.size - 1]);
-           vec.msgs[vec.size - 2] = "-file";
-       }
-       /* 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";
-       }
+    if (strcmp (r1bindex (proc, '/'), "cat") == 0) {
+
+       if (headersw && vec.size == 1)
+           printf ("(Message %s:%s)\n", folder, vec.msgs[0]);
+

     } else if (strcmp (r1bindex (proc, '/'), "mhl") == 0) {
     } else if (strcmp (r1bindex (proc, '/'), "mhl") == 0) {

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

        /* If "mhl", then run it internally */
        /* If "mhl", then run it internally */

-       vec.msgs[0] = "mhl";
+       argsplit_insert(&vec, "mhl", &program);

        app_msgarg(&vec, NULL);
        mhl (vec.size, vec.msgs);
        done (0);
        app_msgarg(&vec, NULL);
        mhl (vec.size, vec.msgs);
        done (0);

+
+    } else {
+       int i;
+       char **mp;
+
+       for (i = 0, mp = non_mhl_vec.msgs; i < non_mhl_vec.size; ++i, ++mp) {
+           if (draftsw || file) {
+               /* Insert the switch before the filename. */
+               app_msgarg(&vec, vec.msgs[vec.size - 1]);
+               vec.msgs[vec.size - 2] = *mp;
+           } else {
+               app_msgarg(&vec, *mp);
+           }
+       }
+
+       if (strcmp (r1bindex (proc, '/'), "mhn") == 0) {
+           /* Add "-file" if showing file or draft, */
+           if (draftsw || file) {
+               app_msgarg(&vec, vec.msgs[vec.size - 1]);
+               vec.msgs[vec.size - 2] = "-file";
+           }
+           /* 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 (headersw && vec.size == 1)
+               printf ("(Message %s:%s)\n", folder, vec.msgs[0]);
+       }

     }
 
     }
 

-    vec.msgs[0] = r1bindex (proc, '/');
+    fflush (stdout);
+
+    argsplit_insert(&vec, proc, &program);

     app_msgarg(&vec, NULL);
     app_msgarg(&vec, NULL);

-    execvp (proc, vec.msgs);
+    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 */
 }


@@ -332,8 +367,7 @@ static int
 is_nontext (char *msgnam)
 {
     int        result, state;
 is_nontext (char *msgnam)
 {
     int        result, state;

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

     char buf[BUFSIZ], name[NAMESZ];
     FILE *fp;
     m_getfld_state_t gstate = 0;
     char buf[BUFSIZ], name[NAMESZ];
     FILE *fp;
     m_getfld_state_t gstate = 0;


@@ -349,11 +383,11 @@ is_nontext (char *msgnam)
            /*
             * Check Content-Type field
             */
            /*
             * Check Content-Type field
             */

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

                int passno;
                char c;
 
                int passno;
                char c;
 

-               cp = add (buf, NULL);
+               cp = mh_xstrdup(buf);

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


@@ -363,7 +397,7 @@ is_nontext (char *msgnam)
                passno = 1;
 
 again:
                passno = 1;
 
 again:

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

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


@@ -380,7 +414,7 @@ invalid:
                            continue;
                        case '(':
                            i++;
                            continue;
                        case '(':
                            i++;

-                           /* and fall... */
+                           /* FALLTHRU */

                        default:
                            continue;
                        case ')':
                        default:
                            continue;
                        case ')':


@@ -405,20 +439,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;
                        continue;
                    if (*dp) {
                        if ((result = !uprf (dp, "charset")))
                            goto out;

-                       dp += sizeof("charset") - 1;
-                       while (isspace (*dp))
+                       dp += LEN("charset");
+                       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, '"')))


@@ -437,7 +471,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;


@@ -448,6 +482,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;


@@ -456,25 +491,26 @@ out:
            /*
             * Check Content-Transfer-Encoding field
             */
            /*
             * Check Content-Transfer-Encoding field
             */

-           if (!mh_strcasecmp (name, ENCODING_FIELD)) {
-               cp = add (buf, NULL);
+           if (!strcasecmp (name, ENCODING_FIELD)) {
+               cp = mh_xstrdup(buf);

                while (state == FLDPLUS) {
                    bufsz = sizeof buf;
                    state = m_getfld (&gstate, name, buf, &bufsz, fp);
                    cp = add (buf, cp);
                }
                while (state == FLDPLUS) {
                    bufsz = sizeof buf;
                    state = m_getfld (&gstate, name, buf, &bufsz, fp);
                    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;


@@ -496,8 +532,8 @@ out:
             */
        default:
            fclose (fp);
             */
        default:
            fclose (fp);

+           m_getfld_state_destroy (&gstate);

            return 0;
        }
     }
            return 0;
        }
     }

-    m_getfld_state_destroy (&gstate);

 }
 }