Folded fileproc to constant `refile'.

[mmh] / uip / show.c

diff --git a/uip/show.c b/uip/show.c
index 2f5d9b4..a0178fe 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -21,19 +21,15 @@ static struct swit switches[] = {
        { "noheader", 0 },
 #define FORMSW  4
        { "form formfile", 0 },
-#define PROGSW  5
-       { "moreproc program", 0 },
-#define WIDTHSW  6
-       { "width columns", 0 },
-#define SHOWSW  7
+#define SHOWSW  5
        { "showproc program", 0 },
-#define SHOWMIMESW  8
+#define SHOWMIMESW  6
        { "showmimeproc program", 0 },
-#define FILESW  9
-       { "file file", -4 },  /* interface from lproc (whatnow) */
-#define VERSIONSW  10
+#define FILESW  7
+       { "file file", -4 },  /* interface from whatnow (listproc) */
+#define VERSIONSW  8
        { "version", 0 },
-#define HELPSW  11
+#define HELPSW  9
        { "help", 0 },
        { NULL, 0 }
 };
@@ -47,6 +43,8 @@ static int is_nontext(char *);
 #define NEXT  1
 #define PREV  2
 
+char *showproc = "mhl";
+char *showmimeproc = "mhshow";
 
 int
 main(int argc, char **argv)
@@ -120,15 +118,6 @@ usage:
                                vec[vecp++] = getcpy(etcpath(cp));
                                continue;
 
-                       case PROGSW:
-                       case WIDTHSW:
-                               vec[vecp++] = --cp;
-                               if (!(cp = *argp++) || *cp == '-')
-                                       adios(NULL, "missing argument to %s",
-                                                       argp[-2]);
-                               vec[vecp++] = cp;
-                               continue;
-
                        case SHOWSW:
                                if (!(showproc = *argp++) || *showproc == '-')
                                        adios(NULL, "missing argument to %s",
@@ -169,14 +158,6 @@ usage:
                goto go_to_it;
        }
 
-#ifdef WHATNOW
-       if (!msgp && !folder && mode == SHOW &&
-                       (cp = getenv("mhdraft")) && *cp) {
-               vec[vecp++] = cp;
-               goto go_to_it;
-       }
-#endif /* WHATNOW */
-
        if (!msgp) {
                switch (mode) {
                case NEXT:
@@ -269,9 +250,6 @@ go_to_it: ;
        /* Set the "proc" */
        proc = (mime) ? showmimeproc : showproc;
 
-       if (folder && !file)
-               m_putenv("mhfolder", folder);
-
        /* Special-cased because mhshow takes msg not files args. */
        if (strcmp(mhbasename(proc), "mhshow")==0) {
                if (file) {