X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fshow.c;h=0b143fd3079ec3a34622014912dad5c309ca724a;hb=0f0af4e32a4d734209c16282b63f7cb1094e2699;hp=a59e10c35f0ae08b3151d08ea5c8e156b172d69a;hpb=5dd6771b28c257af405d7248639ed0e3bcdce38b;p=mmh

diff --git a/uip/show.c b/uip/show.c
index a59e10c..0b143fd 100644
--- a/uip/show.c
+++ b/uip/show.c
@@ -40,9 +40,13 @@ static struct swit switches[] = {
     { "draft", 0 },
 #define	FILESW              13
     { "file file", -4 },		/* interface from showfile */
-#define VERSIONSW           14
+#define FMTPROCSW           14
+    { "fmtproc program", 0 },
+#define NFMTPROCSW          15
+    { "nofmtproc", 0 },
+#define VERSIONSW           16
     { "version", 0 },
-#define	HELPSW              15
+#define	HELPSW              17
     { "help", 0 },
     { NULL, 0 }
 };
@@ -52,9 +56,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
@@ -95,6 +96,7 @@ main (int argc, char **argv)
 		    done (1);
 		case UNKWNSW: 
 		case NPROGSW:
+		case NFMTPROCSW:
 		    vec[vecp++] = --cp;
 		    continue;
 
@@ -103,10 +105,10 @@ main (int argc, char **argv)
 			"%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);
-		    done (1);
+		    done (0);
 
 		case DRFTSW: 
 		    if (file)
@@ -145,6 +147,7 @@ usage:
 		case PROGSW:
 		case LENSW:
 		case WIDTHSW:
+		case FMTPROCSW:
 		    vec[vecp++] = --cp;
 		    if (!(cp = *argp++) || *cp == '-')
 			adios (NULL, "missing argument to %s", argp[-2]);
@@ -281,7 +284,7 @@ go_to_it: ;
 	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++)
@@ -362,19 +365,6 @@ go_to_it: ;
     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