Removed the -nomoreproc switch from mhl, show, mhshow.

[mmh] / uip / mhl.c

diff --git a/uip/mhl.c b/uip/mhl.c
index d3b7429..017d2f7 100644 (file)
--- a/uip/mhl.c
+++ b/uip/mhl.c
@@ -55,29 +55,27 @@ static struct swit mhlswitches[] = {
        { "form formfile", 0 },
 #define PROGSW  6
        { "moreproc program", 0 },
-#define NPROGSW  7
-       { "nomoreproc", 0 },
-#define LENSW  8
+#define LENSW  7
        { "length lines", 0 },
-#define WIDTHSW  9
+#define WIDTHSW  8
        { "width columns", 0 },
-#define SLEEPSW  10
+#define SLEEPSW  9
        { "sleep seconds",  0 },
-#define VERSIONSW  11
+#define VERSIONSW  10
        { "version", 0 },
-#define HELPSW  12
+#define HELPSW  11
        { "help", 0 },
-#define FORW1SW  13
+#define FORW1SW  12
        { "forward", -7 },
-#define FORW2SW  14
+#define FORW2SW  13
        { "forwall", -7 },
-#define DGSTSW  15
+#define DGSTSW  14
        { "digest list", -6 },
-#define VOLUMSW  16
+#define VOLUMSW  15
        { "volume number", -6 },
-#define ISSUESW  17
+#define ISSUESW  16
        { "issue number", -5 },
-#define NBODYSW  18
+#define NBODYSW  17
        { "nobody", -6 },
        { NULL, 0 }
 };
@@ -277,7 +275,7 @@ int sc_hardcopy(void);  /* from termsbr.c */
 int
 main(int argc, char **argv)
 {
-       int length = 0, nomore = 0;
+       int length = 0;
        int i, width = 0, vecp = 0;
        char *cp, *folder = NULL, *form = NULL;
        char buf[BUFSIZ], *files[MAXARGS];
@@ -352,9 +350,6 @@ main(int argc, char **argv)
                                        adios(NULL, "missing argument to %s",
                                                        argp[-2]);
                                continue;
-                       case NPROGSW:
-                               nomore++;
-                               continue;
 
                        case LENSW:
                                if (!(cp = *argp++) || *cp == '-')
@@ -415,7 +410,7 @@ main(int argc, char **argv)
                folder = getenv("mhfolder");
 
        if (isatty(fileno(stdout))) {
-               if (!nomore && !sc_hardcopy() && moreproc && *moreproc != '\0') {
+               if (!sc_hardcopy() && moreproc && *moreproc != '\0') {
                        if (mhl_action) {
                                SIGNAL(SIGINT, SIG_IGN);
                                SIGNAL2(SIGQUIT, quitser);