show: Special-cased -show(mime)proc for mhshow: it needs msgs not file args.

[mmh] / uip / mhlsbr.c

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index 1764aa5..5625fa1 100644 (file)
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -63,25 +63,21 @@ static struct swit mhlswitches[] = {
        { "width columns", 0 },
 #define SLEEPSW  10
        { "sleep seconds",  0 },
-#define BITSTUFFSW  11
-       { "dashstuffing", -12 },  /* interface from forw */
-#define NBITSTUFFSW   12
-       { "nodashstuffing", -14 },  /* interface from forw */
-#define VERSIONSW  13
+#define VERSIONSW  11
        { "version", 0 },
-#define HELPSW  14
+#define HELPSW  12
        { "help", 0 },
-#define FORW1SW  15
-       { "forward", -7 },  /* interface from forw */
-#define FORW2SW  16
-       { "forwall", -7 },  /* interface from forw */
-#define DGSTSW  17
+#define FORW1SW  13
+       { "forward", -7 },
+#define FORW2SW  14
+       { "forwall", -7 },
+#define DGSTSW  15
        { "digest list", -6 },
-#define VOLUMSW  18
+#define VOLUMSW  16
        { "volume number", -6 },
-#define ISSUESW  19
+#define ISSUESW  17
        { "issue number", -5 },
-#define NBODYSW  20
+#define NBODYSW  18
        { "nobody", -6 },
        { NULL, 0 }
 };
@@ -189,7 +185,6 @@ static struct triple triples[] = {
 
 static int bellflg   = 0;
 static int clearflg  = 0;
-static int dashstuff = 0;
 static int dobody    = 1;
 static int forwflg   = 0;
 static int forwall   = 0;
@@ -229,8 +224,8 @@ static char *ignores[MAXARGS];
 static  jmp_buf env;
 static  jmp_buf mhlenv;
 
-static char delim3[] = /* from forw.c */
-       "\n----------------------------------------------------------------------\n\n";
+static char delim3[] =
+"\n----------------------------------------------------------------------\n\n";
 static char delim4[] = "\n------------------------------\n\n";
 
 static FILE *(*mhl_action) () = (FILE *(*) ()) 0;
@@ -406,13 +401,6 @@ mhl(int argc, char **argv)
                                clearflg = -1;/* XXX */
                                continue;
 
-                       case BITSTUFFSW:
-                               dashstuff = 1;  /* trinary logic */
-                               continue;
-                       case NBITSTUFFSW:
-                               dashstuff = -1;  /* trinary logic */
-                               continue;
-
                        case NBODYSW:
                                dobody = 0;
                                continue;
@@ -671,7 +659,9 @@ evalvar(struct mcomp *c1)
 
                if (ptos(name, &cp))
                        return 1;
-               nfs = new_fs(NULL, NULL, cp);
+               cp = concat("=", cp, NULL);
+               nfs = new_fs(cp, NULL);
+               free(cp);
                c1->c_nfs = getcpy(nfs);
                c1->c_flags |= FORMAT;
                return 0;
@@ -680,7 +670,7 @@ evalvar(struct mcomp *c1)
        if (!mh_strcasecmp(name, "decode")) {
                char *nfs;
 
-               nfs = new_fs(NULL, NULL, "%(decode{text})");
+               nfs = new_fs("=%(decode{text})", NULL);
                c1->c_nfs = getcpy(nfs);
                c1->c_flags |= FORMAT;
                return 0;
@@ -696,8 +686,6 @@ evalvar(struct mcomp *c1)
                return ptoi(name, &c1->c_cwidth);
        if (!mh_strcasecmp(name, "length"))
                return ptoi(name, &c1->c_length);
-       if (!mh_strcasecmp(name, "nodashstuffing"))
-               return (dashstuff = -1);
 
        for (ap = triples; ap->t_name; ap++)
                if (!mh_strcasecmp(ap->t_name, name)) {
@@ -1379,7 +1367,7 @@ putch(char ch)
                ** If we are forwarding this message, and the first
                ** column contains a dash, then add a dash and a space.
                */
-               if (column == 0 && forwflg && (dashstuff >= 0) && ch == '-') {
+               if (column == 0 && forwflg && ch == '-') {
                        putchar('-');
                        putchar(' ');
                }