Added test-refile.

[mmh] / uip / show.c

diff --git a/uip/show.c b/uip/show.c
index 31a05e9..1b11871 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -2,8 +2,6 @@
 /*
  * 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.
@@ -54,9 +52,6 @@ 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
@@ -71,7 +66,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, "");
@@ -179,7 +174,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;
@@ -385,7 +380,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;