repl: renamed -noformat to -nofilter; removed -format; default to -filter.

[mmh] / uip / repl.c

diff --git a/uip/repl.c b/uip/repl.c
index 299185d..4e2c18a 100644 (file)
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -33,33 +33,31 @@ static struct swit switches[] = {
        { "noedit", 0 },
 #define FILTSW  8
        { "filter filterfile", 0 },
-#define FORMSW  9
+#define NFILTSW  9
+       { "nofilter", 0 },
+#define FORMSW  10
        { "form formfile", 0 },
-#define FRMTSW  10
-       { "format", 5 },
-#define NFRMTSW  11
-       { "noformat", 7 },
-#define MIMESW  12
+#define MIMESW  11
        { "mime", 0 },
-#define NMIMESW  13
+#define NMIMESW  12
        { "nomime", 0 },
-#define QURYSW  14
+#define QURYSW  13
        { "query", 0 },
-#define NQURYSW  15
+#define NQURYSW  14
        { "noquery", 0 },
-#define WHATSW  16
+#define WHATSW  15
        { "whatnowproc program", 0 },
-#define NWHATSW  17
+#define NWHATSW  16
        { "nowhatnowproc", 0 },
-#define VERSIONSW  18
+#define VERSIONSW  17
        { "version", 0 },
-#define HELPSW  19
+#define HELPSW  18
        { "help", 0 },
-#define FILESW  20
+#define FILESW  19
        { "file file", 4 },  /* interface from msh */
 
 #ifdef MHE
-#define BILDSW  21
+#define BILDSW  20
        { "build", 5 },  /* interface from mhe */
 #endif
 
@@ -151,6 +149,8 @@ main(int argc, char **argv)
        struct msgs *mp = NULL;
        FILE *in;
 
+       filter = getcpy(etcpath(mhlreply));
+
 #ifdef MHE
        int buildsw = 0;
 #endif /* MHE */
@@ -243,22 +243,19 @@ main(int argc, char **argv)
                                                        argp[-2]);
                                file = getcpy(expanddir(cp));
                                continue;
-                       case FILTSW:
-                               if (!(cp = *argp++) || *cp == '-')
-                                       adios(NULL, "missing argument to %s",
-                                                       argp[-2]);
-                               filter = getcpy(etcpath(cp));
-                               continue;
                        case FORMSW:
                                if (!(form = *argp++) || *form == '-')
                                        adios(NULL, "missing argument to %s",
                                                        argp[-2]);
                                continue;
 
-                       case FRMTSW:
-                               filter = getcpy(etcpath(mhlreply));
+                       case FILTSW:
+                               if (!(cp = *argp++) || *cp == '-')
+                                       adios(NULL, "missing argument to %s",
+                                                       argp[-2]);
+                               filter = getcpy(etcpath(cp));
                                continue;
-                       case NFRMTSW:
+                       case NFILTSW:
                                filter = NULL;
                                continue;