Remove RCS keywords, since they no longer work after git migration.

[mmh] / uip / show.c

diff --git a/uip/show.c b/uip/show.c
index 5ab6370..a59e10c 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -2,11 +2,14 @@
 /*
  * 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.
  */
 
 #include <h/mh.h>
 #include <h/mime.h>
+#include <h/utils.h>
 
 static struct swit switches[] = {
 #define CHECKMIMESW          0
@@ -49,6 +52,9 @@ static struct swit switches[] = {
  */
 static int is_nontext(char *);
 
+/* prototype from mhlsbr.c */
+int mhl (int, char **);
+
 #define        SHOW  0
 #define        NEXT  1
 #define        PREV  2
@@ -63,7 +69,7 @@ main (int argc, char **argv)
     char *cp, *maildir, *file = NULL, *folder = NULL, *proc;
     char buf[BUFSIZ], **argp, **arguments;
     char *msgs[MAXARGS], *vec[MAXARGS];
-    struct msgs *mp;
+    struct msgs *mp = NULL;
 
 #ifdef LOCALE
     setlocale(LC_ALL, "");
@@ -73,9 +79,9 @@ main (int argc, char **argv)
     /* read user profile/context */
     context_read();
 
-    if (!strcasecmp (invo_name, "next")) {
+    if (!mh_strcasecmp (invo_name, "next")) {
        mode = NEXT;
-    } else if (!strcasecmp (invo_name, "prev")) {
+    } else if (!mh_strcasecmp (invo_name, "prev")) {
        mode = PREV;
     }
     arguments = getarguments (invo_name, argc, argv, 1);
@@ -171,7 +177,7 @@ usage:
            if (folder)
                adios (NULL, "only one folder at a time!");
            else
-               folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+               folder = pluspath (cp);
        } else {
            if (mode != SHOW)
                goto usage;
@@ -315,6 +321,14 @@ go_to_it: ;
        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.
@@ -345,6 +359,7 @@ go_to_it: ;
     vec[0] = r1bindex (proc, '/');
     execvp (proc, vec);
     adios (proc, "unable to exec");
+    return 0;  /* dead code to satisfy the compiler */
 }
 
 /*
@@ -368,7 +383,8 @@ static int
 is_nontext (char *msgnam)
 {
     int        result, state;
-    char *bp, *cp, *dp;
+    unsigned char *bp, *dp;
+    char *cp;
     char buf[BUFSIZ], name[NAMESZ];
     FILE *fp;
 
@@ -383,7 +399,7 @@ is_nontext (char *msgnam)
            /*
             * Check Content-Type field
             */
-           if (!strcasecmp (name, TYPE_FIELD)) {
+           if (!mh_strcasecmp (name, TYPE_FIELD)) {
                int passno;
                char c;
 
@@ -438,7 +454,7 @@ invalid:
                if (!*bp)
                    goto invalid;
                if (passno > 1) {
-                   if ((result = (strcasecmp (bp, "plain") != 0)))
+                   if ((result = (mh_strcasecmp (bp, "plain") != 0)))
                        goto out;
                    *dp = c;
                    for (dp++; isspace (*dp); dp++)
@@ -458,7 +474,7 @@ invalid:
                                *bp = '\0';
                        } else {
                            for (bp = dp; *bp; bp++)
-                               if (isspace (*bp)) {
+                               if (!istoken (*bp)) {
                                    *bp = '\0';
                                    break;
                                }
@@ -470,7 +486,7 @@ invalid:
                    /* Check the character set */
                    result = !check_charset (dp, strlen (dp));
                } else {
-                   if (!(result = (strcasecmp (bp, "text") != 0))) {
+                   if (!(result = (mh_strcasecmp (bp, "text") != 0))) {
                        *dp = c;
                        bp = dp;
                        passno = 2;
@@ -489,7 +505,7 @@ out:
            /*
             * Check Content-Transfer-Encoding field
             */
-           if (!strcasecmp (name, ENCODING_FIELD)) {
+           if (!mh_strcasecmp (name, ENCODING_FIELD)) {
                cp = add (buf, NULL);
                while (state == FLDPLUS) {
                    state = m_getfld (state, name, buf, sizeof(buf), fp);
@@ -500,9 +516,9 @@ out:
                for (dp = bp; istoken (*dp); dp++)
                    continue;
                *dp = '\0';
-               result = (strcasecmp (bp, "7bit")
-                      && strcasecmp (bp, "8bit")
-                      && strcasecmp (bp, "binary"));
+               result = (mh_strcasecmp (bp, "7bit")
+                      && mh_strcasecmp (bp, "8bit")
+                      && mh_strcasecmp (bp, "binary"));
 
                free (cp);
                if (result) {