moreproc is now Pager/defaultpager; removed -moreproc flags; added env vars.

[mmh] / uip / show.c

diff --git a/uip/show.c b/uip/show.c
index 2f5d9b4..70df693 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
+#define FILESW  7
        { "file file", -4 },  /* interface from lproc (whatnow) */
-#define VERSIONSW  10
+#define VERSIONSW  8
        { "version", 0 },
-#define HELPSW  11
+#define HELPSW  9
        { "help", 0 },
        { NULL, 0 }
 };
@@ -120,15 +116,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",