X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fshow.c;h=b5b48c50e87d8125f912e37efb22d4e030ea42bc;hb=5d43a99db70c12a673028c7758c20cbe3e13ef5f;hp=31a05e93146373a2021a51bc59a63b1c44183f16;hpb=d2f12554a254e814dcdafb3828fc0d9936154eef;p=mmh

diff --git a/uip/show.c b/uip/show.c
index 31a05e9..b5b48c5 100644
--- 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.
@@ -71,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, "");
@@ -179,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;
@@ -365,27 +363,14 @@ go_to_it: ;
 }
 
 /*
- * 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
  */
 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;