show: Special-cased -show(mime)proc for mhshow: it needs msgs not file args.
[mmh] / uip / mhlsbr.c
index 7bce5da..5625fa1 100644 (file)
@@ -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;
@@ -304,106 +299,111 @@ mhl(int argc, char **argv)
        while ((cp = *argp++)) {
                if (*cp == '-') {
                        switch (smatch(++cp, mhlswitches)) {
-                               case AMBIGSW:
-                                       ambigsw(cp, mhlswitches);
-                                       done(1);
-                               case UNKWNSW:
-                                       adios(NULL, "-%s unknown\n", cp);
-
-                               case HELPSW:
-                                       snprintf(buf, sizeof(buf), "%s [switches] [files ...]", invo_name);
-                                       print_help(buf, mhlswitches, 1);
-                                       done(1);
-                               case VERSIONSW:
-                                       print_version(invo_name);
-                                       done(1);
-
-                               case BELLSW:
-                                       bellflg = 1;
-                                       continue;
-                               case NBELLSW:
-                                       bellflg = -1;
-                                       continue;
-
-                               case CLRSW:
-                                       clearflg = 1;
-                                       continue;
-                               case NCLRSW:
-                                       clearflg = -1;
-                                       continue;
+                       case AMBIGSW:
+                               ambigsw(cp, mhlswitches);
+                               done(1);
+                       case UNKWNSW:
+                               adios(NULL, "-%s unknown\n", cp);
+
+                       case HELPSW:
+                               snprintf(buf, sizeof(buf), "%s [switches] [files ...]", invo_name);
+                               print_help(buf, mhlswitches, 1);
+                               done(1);
+                       case VERSIONSW:
+                               print_version(invo_name);
+                               done(1);
+
+                       case BELLSW:
+                               bellflg = 1;
+                               continue;
+                       case NBELLSW:
+                               bellflg = -1;
+                               continue;
 
-                               case FOLDSW:
-                                       if (!(folder = *argp++) ||
-                                                       *folder == '-')
-                                               adios(NULL, "missing argument to %s", argp[-2]);
-                                       continue;
-                               case FORMSW:
-                                       if (!(form = *argp++) || *form == '-')
-                                               adios(NULL, "missing argument to %s", argp[-2]);
-                                       continue;
+                       case CLRSW:
+                               clearflg = 1;
+                               continue;
+                       case NCLRSW:
+                               clearflg = -1;
+                               continue;
 
-                               case SLEEPSW:
-                                       if (!(cp = *argp++) || *cp == '-')
-                                               adios(NULL, "missing argument to %s", argp[-2]);
-                                       sleepsw = atoi(cp);  /* ZERO ok! */
-                                       continue;
+                       case FOLDSW:
+                               if (!(folder = *argp++) || *folder == '-')
+                                       adios(NULL, "missing argument to %s",
+                                                       argp[-2]);
+                               continue;
+                       case FORMSW:
+                               if (!(form = *argp++) || *form == '-')
+                                       adios(NULL, "missing argument to %s",
+                                                       argp[-2]);
+                               continue;
 
-                               case PROGSW:
-                                       if (!(moreproc = *argp++) || *moreproc == '-')
-                                               adios(NULL, "missing argument to %s", argp[-2]);
-                                       continue;
-                               case NPROGSW:
-                                       nomore++;
-                                       continue;
+                       case SLEEPSW:
+                               if (!(cp = *argp++) || *cp == '-')
+                                       adios(NULL, "missing argument to %s",
+                                                       argp[-2]);
+                               sleepsw = atoi(cp);  /* ZERO ok! */
+                               continue;
 
-                               case LENSW:
-                                       if (!(cp = *argp++) || *cp == '-')
-                                               adios(NULL, "missing argument to %s", argp[-2]);
-                                       if ((length = atoi(cp)) < 1)
-                                               adios(NULL, "bad argument %s %s", argp[-2], cp);
-                                       continue;
-                               case WIDTHSW:
-                                       if (!(cp = *argp++) || *cp == '-')
-                                               adios(NULL, "missing argument to %s", argp[-2]);
-                                       if ((width = atoi(cp)) < 1)
-                                               adios(NULL, "bad argument %s %s", argp[-2], cp);
-                                       continue;
+                       case PROGSW:
+                               if (!(moreproc = *argp++) || *moreproc == '-')
+                                       adios(NULL, "missing argument to %s",
+                                                       argp[-2]);
+                               continue;
+                       case NPROGSW:
+                               nomore++;
+                               continue;
 
-                               case DGSTSW:
-                                       if (!(digest = *argp++) ||
-                                                       *digest == '-')
-                                               adios(NULL, "missing argument to %s", argp[-2]);
-                                       continue;
-                               case ISSUESW:
-                                       if (!(cp = *argp++) || *cp == '-')
-                                               adios(NULL, "missing argument to %s", argp[-2]);
-                                       if ((issue = atoi(cp)) < 1)
-                                               adios(NULL, "bad argument %s %s", argp[-2], cp);
-                                       continue;
-                               case VOLUMSW:
-                                       if (!(cp = *argp++) || *cp == '-')
-                                               adios(NULL, "missing argument to %s", argp[-2]);
-                                       if ((volume = atoi(cp)) < 1)
-                                               adios(NULL, "bad argument %s %s", argp[-2], cp);
-                                       continue;
+                       case LENSW:
+                               if (!(cp = *argp++) || *cp == '-')
+                                       adios(NULL, "missing argument to %s",
+                                                       argp[-2]);
+                               if ((length = atoi(cp)) < 1)
+                                       adios(NULL, "bad argument %s %s",
+                                                       argp[-2], cp);
+                               continue;
+                       case WIDTHSW:
+                               if (!(cp = *argp++) || *cp == '-')
+                                       adios(NULL, "missing argument to %s",
+                                                       argp[-2]);
+                               if ((width = atoi(cp)) < 1)
+                                       adios(NULL, "bad argument %s %s",
+                                                       argp[-2], cp);
+                               continue;
 
-                               case FORW2SW:
-                                       forwall++;  /* fall */
-                               case FORW1SW:
-                                       forwflg++;
-                                       clearflg = -1;/* XXX */
-                                       continue;
+                       case DGSTSW:
+                               if (!(digest = *argp++) ||
+                                               *digest == '-')
+                                       adios(NULL, "missing argument to %s",
+                                                       argp[-2]);
+                               continue;
+                       case ISSUESW:
+                               if (!(cp = *argp++) || *cp == '-')
+                                       adios(NULL, "missing argument to %s",
+                                                       argp[-2]);
+                               if ((issue = atoi(cp)) < 1)
+                                       adios(NULL, "bad argument %s %s",
+                                                       argp[-2], cp);
+                               continue;
+                       case VOLUMSW:
+                               if (!(cp = *argp++) || *cp == '-')
+                                       adios(NULL, "missing argument to %s",
+                                                       argp[-2]);
+                               if ((volume = atoi(cp)) < 1)
+                                       adios(NULL, "bad argument %s %s",
+                                                       argp[-2], cp);
+                               continue;
 
-                               case BITSTUFFSW:
-                                       dashstuff = 1;  /* trinary logic */
-                                       continue;
-                               case NBITSTUFFSW:
-                                       dashstuff = -1;  /* trinary logic */
-                                       continue;
+                       case FORW2SW:
+                               forwall++;  /* fall */
+                       case FORW1SW:
+                               forwflg++;
+                               clearflg = -1;/* XXX */
+                               continue;
 
-                               case NBODYSW:
-                                       dobody = 0;
-                                       continue;
+                       case NBODYSW:
+                               dobody = 0;
+                               continue;
                        }
                }
                files[vecp++] = cp;
@@ -535,69 +535,64 @@ mhl_format(char *file, int length, int width)
                parptr = bp;
                strncpy(name, parse(), sizeof(name));
                switch(*parptr) {
-                       case '\0':
-                       case ',':
-                       case '=':
+               case '\0':
+               case ',':
+               case '=':
+                       /*
+                       ** Split this list of fields to ignore, and copy
+                       ** it to the end of the current "ignores" list.
+                       */
+                       if (!mh_strcasecmp(name, "ignores")) {
+                               char **tmparray, **p;
+                               int n = 0;
+
+                               /* split the fields */
+                               tmparray = brkstring(getcpy(++parptr), ",",
+                                               NULL);
+
+                               /* count number of fields split */
+                               p = tmparray;
+                               while (*p++)
+                                       n++;
+
                                /*
-                               ** Split this list of fields to ignore,
-                               ** and copy it to the end of the current
-                               ** "ignores" list.
+                               ** copy pointers to split fields
+                               ** to ignores array
                                */
-                               if (!mh_strcasecmp(name, "ignores")) {
-                                       char **tmparray, **p;
-                                       int n = 0;
-
-                                       /* split the fields */
-                                       tmparray = brkstring(getcpy(++parptr),
-                                                       ",", NULL);
-
-                                       /* count number of fields split */
-                                       p = tmparray;
-                                       while (*p++)
-                                               n++;
-
-                                       /*
-                                       ** copy pointers to split fields
-                                       ** to ignores array
-                                       */
-                                       ip = copyip(tmparray, ip,
-                                                       MAXARGS - num_ignores);
-                                       num_ignores += n;
-                                       continue;
-                               }
-                               parptr = bp;
-                               while (*parptr) {
-                                       if (evalvar(&global))
-                                               adios(NULL, "format file syntax error: %s", bp);
-                                       if (*parptr)
-                                               parptr++;
-                               }
+                               ip = copyip(tmparray, ip,
+                                               MAXARGS - num_ignores);
+                               num_ignores += n;
                                continue;
-
-                       case ':':
-                               c1 = add_queue(&fmthd, &fmttl, name, NULL,
-                                               INIT);
-                               while (*parptr == ':' || *parptr == ',') {
+                       }
+                       parptr = bp;
+                       while (*parptr) {
+                               if (evalvar(&global))
+                                       adios(NULL, "format file syntax error: %s", bp);
+                               if (*parptr)
                                        parptr++;
-                                       if (evalvar(c1))
-                                               adios(NULL, "format file syntax error: %s", bp);
-                               }
-                               if (!c1->c_nfs && global.c_nfs) {
-                                       if (c1->c_flags & DATEFMT) {
-                                               if (global.c_flags & DATEFMT)
-                                                       c1->c_nfs = getcpy(global.c_nfs);
-                                       }
-                                       else
-                                               if (c1->c_flags & ADDRFMT) {
-                                                       if (global.c_flags & ADDRFMT)
-                                                               c1->c_nfs = getcpy(global.c_nfs);
-                                               }
+                       }
+                       continue;
+
+               case ':':
+                       c1 = add_queue(&fmthd, &fmttl, name, NULL, INIT);
+                       while (*parptr == ':' || *parptr == ',') {
+                               parptr++;
+                               if (evalvar(c1))
+                                       adios(NULL, "format file syntax error: %s", bp);
+                       }
+                       if (!c1->c_nfs && global.c_nfs) {
+                               if ((c1->c_flags & DATEFMT) &&
+                                               (global.c_flags & DATEFMT)) {
+                                       c1->c_nfs = getcpy(global.c_nfs);
+                               } else if ((c1->c_flags & ADDRFMT) &&
+                                               (global.c_flags & ADDRFMT)) {
+                                       c1->c_nfs = getcpy(global.c_nfs);
                                }
-                               continue;
+                       }
+                       continue;
 
-                       default:
-                               adios(NULL, "format file syntax error: %s",
-                                               bp);
+               default:
+                       adios(NULL, "format file syntax error: %s", bp);
                }
        }
        fclose(fp);
@@ -620,12 +615,12 @@ out:
        }
 
        switch (bellflg) {  /* command line may override format file */
-               case 1:
-                       global.c_flags |= BELL;
-                       break;
-               case -1:
-                       global.c_flags &= ~BELL;
-                       break;
+       case 1:
+               global.c_flags |= BELL;
+               break;
+       case -1:
+               global.c_flags &= ~BELL;
+               break;
        }
 
        if (length)
@@ -664,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;
@@ -673,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;
@@ -689,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)) {
@@ -780,39 +775,38 @@ process(char *folder, char *fname, int ofilen, int ofilec)
        struct mcomp *c1;
 
        switch (setjmp(env)) {
-               case OK:
-                       if (fname) {
-                               fp = mhl_action ? (*mhl_action) (fname) :
-                                               fopen(fname, "r");
-                               if (fp == NULL) {
-                                       advise(fname, "unable to open");
-                                       exitstat++;
-                                       return;
-                               }
-                       } else {
-                               fname = "(stdin)";
-                               fp = stdin;
+       case OK:
+               if (fname) {
+                       fp = mhl_action ? (*mhl_action) (fname) :
+                                       fopen(fname, "r");
+                       if (fp == NULL) {
+                               advise(fname, "unable to open");
+                               exitstat++;
+                               return;
                        }
-                       cp = folder ? concat(folder, ":", fname, NULL) :
-                                       getcpy(fname);
-                       if (ontty != PITTY)
-                               SIGNAL(SIGINT, intrser);
-                       mhlfile(fp, cp, ofilen, ofilec);  /* FALL THROUGH! */
+               } else {
+                       fname = "(stdin)";
+                       fp = stdin;
+               }
+               cp = folder ? concat(folder, ":", fname, NULL) : getcpy(fname);
+               if (ontty != PITTY)
+                       SIGNAL(SIGINT, intrser);
+               mhlfile(fp, cp, ofilen, ofilec);  /* FALL THROUGH! */
 
-               default:
-                       if (ontty != PITTY)
-                               SIGNAL(SIGINT, SIG_IGN);
-                       if (mhl_action == NULL && fp != stdin)
-                               fclose(fp);
-                       free(cp);
-                       if (holder.c_text) {
-                               free(holder.c_text);
-                               holder.c_text = NULL;
-                       }
-                       free_queue(&msghd, &msgtl);
-                       for (c1 = fmthd; c1; c1 = c1->c_next)
-                               c1->c_flags &= ~HDROUTPUT;
-                       break;
+       default:
+               if (ontty != PITTY)
+                       SIGNAL(SIGINT, SIG_IGN);
+               if (mhl_action == NULL && fp != stdin)
+                       fclose(fp);
+               free(cp);
+               if (holder.c_text) {
+                       free(holder.c_text);
+                       holder.c_text = NULL;
+               }
+               free_queue(&msghd, &msgtl);
+               for (c1 = fmthd; c1; c1 = c1->c_next)
+                       c1->c_flags &= ~HDROUTPUT;
+               break;
        }
 }
 
@@ -838,135 +832,136 @@ mhlfile(FILE *fp, char *mname, int ofilen, int ofilec)
                }
        } else {
                switch (ontty) {
-                       case PITTY:
-                               if (ofilec > 1) {
-                                       if (ofilen > 1) {
-                                               if ((global.c_flags & CLEARSCR))
-                                                       clear_screen();
-                                               else
-                                                       printf("\n\n\n");
-                                       }
-                                       printf(">>> %s\n\n", mname);
-                               }
-                               break;
-
-                       case ISTTY:
-                               strncpy(buf, "\n", sizeof(buf));
-                               if (ofilec > 1) {
-                                       if (SOprintf("Press <return> to list \"%s\"...", mname)) {
-                                               if (ofilen > 1)
-                                                       printf("\n\n\n");
-                                               printf("Press <return> to list \"%s\"...", mname);
-                                       }
-                                       fflush(stdout);
-                                       buf[0] = 0;
-                                       read(fileno(stdout), buf, sizeof(buf));
-                               }
-                               if (strchr(buf, '\n')) {
+               case PITTY:
+                       if (ofilec > 1) {
+                               if (ofilen > 1) {
                                        if ((global.c_flags & CLEARSCR))
                                                clear_screen();
+                                       else
+                                               printf("\n\n\n");
                                }
-                               else
-                                       printf("\n");
-                               break;
+                               printf(">>> %s\n\n", mname);
+                       }
+                       break;
 
-                       default:
-                               if (ofilec > 1) {
-                                       if (ofilen > 1) {
+               case ISTTY:
+                       strncpy(buf, "\n", sizeof(buf));
+                       if (ofilec > 1) {
+                               if (SOprintf("Press <return> to list \"%s\"...", mname)) {
+                                       if (ofilen > 1)
                                                printf("\n\n\n");
-                                               if (clearflg > 0)
-                                                       clear_screen();
-                                       }
-                                       printf(">>> %s\n\n", mname);
+                                       printf("Press <return> to list \"%s\"...", mname);
                                }
-                               break;
+                               fflush(stdout);
+                               buf[0] = 0;
+                               read(fileno(stdout), buf, sizeof(buf));
+                       }
+                       if (strchr(buf, '\n')) {
+                               if ((global.c_flags & CLEARSCR))
+                                       clear_screen();
+                       } else
+                               printf("\n");
+                       break;
+
+               default:
+                       if (ofilec > 1) {
+                               if (ofilen > 1) {
+                                       printf("\n\n\n");
+                                       if (clearflg > 0)
+                                               clear_screen();
+                               }
+                               printf(">>> %s\n\n", mname);
+                       }
+                       break;
                }
        }
 
        for (state = FLD;;) {
                switch (state = m_getfld(state, name, buf, sizeof(buf), fp)) {
-                       case FLD:
-                       case FLDPLUS:
-                               for (ip = ignores; *ip; ip++)
-                                       if (!mh_strcasecmp(name, *ip)) {
-                                               while (state == FLDPLUS)
-                                                       state = m_getfld(state, name, buf, sizeof(buf), fp);
-                                               break;
-                                       }
-                               if (*ip)
-                                       continue;
-
-                               for (c2 = fmthd; c2; c2 = c2->c_next)
-                                       if (!mh_strcasecmp(c2->c_name, name))
-                                               break;
-                               c1 = NULL;
-                               if (!((c3 = c2 ? c2 : &global)->c_flags & SPLIT))
-                                       for (c1 = msghd; c1; c1 = c1->c_next)
-                                               if (!mh_strcasecmp(c1->c_name, c3->c_name)) {
-                                                       c1->c_text = mcomp_add (c1->c_flags, buf, c1->c_text);
-                                                       break;
-                                               }
-                               if (c1 == NULL)
-                                       c1 = add_queue(&msghd, &msgtl, name, buf, 0);
-                               while (state == FLDPLUS) {
-                                       state = m_getfld(state, name, buf, sizeof(buf), fp);
-                                       c1->c_text = add(buf, c1->c_text);
+               case FLD:
+               case FLDPLUS:
+                       for (ip = ignores; *ip; ip++)
+                               if (!mh_strcasecmp(name, *ip)) {
+                                       while (state == FLDPLUS)
+                                               state = m_getfld(state, name, buf, sizeof(buf), fp);
+                                       break;
                                }
-                               if (c2 == NULL)
-                                       c1->c_flags |= EXTRA;
+                       if (*ip)
                                continue;
 
-                       case BODY:
-                       case FILEEOF:
-                               row = column = 0;
-                               for (c1 = fmthd; c1; c1 = c1->c_next) {
-                                       if (c1->c_flags & CLEARTEXT) {
-                                               putcomp(c1, c1, ONECOMP);
-                                               continue;
-                                       }
-                                       if (!mh_strcasecmp(c1->c_name, "messagename")) {
-                                               holder.c_text = concat("(Message ", mname, ")\n",
-                                                                                       NULL);
-                                               putcomp(c1, &holder, ONECOMP);
-                                               free(holder.c_text);
-                                               holder.c_text = NULL;
-                                               continue;
-                                       }
-                                       if (!mh_strcasecmp(c1->c_name, "extras")) {
-                                               for (c2 = msghd; c2; c2 = c2->c_next)
-                                                       if (c2->c_flags & EXTRA)
-                                                               putcomp(c1, c2, TWOCOMP);
-                                               continue;
-                                       }
-                                       if (dobody && !mh_strcasecmp(c1->c_name, "body")) {
-                                               holder.c_text = mh_xmalloc(sizeof(buf));
-                                               strncpy(holder.c_text, buf, sizeof(buf));
-                                               while (state == BODY) {
-                                                       putcomp(c1, &holder, BODYCOMP);
-                                                       state = m_getfld(state, name, holder.c_text, sizeof(buf), fp);
-                                               }
-                                               free(holder.c_text);
-                                               holder.c_text = NULL;
-                                               continue;
+                       for (c2 = fmthd; c2; c2 = c2->c_next)
+                               if (!mh_strcasecmp(c2->c_name, name))
+                                       break;
+                       c1 = NULL;
+                       if (!((c3 = c2 ? c2 : &global)->c_flags & SPLIT))
+                               for (c1 = msghd; c1; c1 = c1->c_next)
+                                       if (!mh_strcasecmp(c1->c_name,
+                                                       c3->c_name)) {
+                                               c1->c_text = mcomp_add(c1->c_flags, buf, c1->c_text);
+                                               break;
                                        }
+                       if (c1 == NULL)
+                               c1 = add_queue(&msghd, &msgtl, name, buf, 0);
+                       while (state == FLDPLUS) {
+                               state = m_getfld(state, name, buf,
+                                               sizeof(buf), fp);
+                               c1->c_text = add(buf, c1->c_text);
+                       }
+                       if (c2 == NULL)
+                               c1->c_flags |= EXTRA;
+                       continue;
+
+               case BODY:
+               case FILEEOF:
+                       row = column = 0;
+                       for (c1 = fmthd; c1; c1 = c1->c_next) {
+                               if (c1->c_flags & CLEARTEXT) {
+                                       putcomp(c1, c1, ONECOMP);
+                                       continue;
+                               }
+                               if (!mh_strcasecmp(c1->c_name, "messagename")) {
+                                       holder.c_text = concat("(Message ",
+                                                       mname, ")\n", NULL);
+                                       putcomp(c1, &holder, ONECOMP);
+                                       free(holder.c_text);
+                                       holder.c_text = NULL;
+                                       continue;
+                               }
+                               if (!mh_strcasecmp(c1->c_name, "extras")) {
                                        for (c2 = msghd; c2; c2 = c2->c_next)
-                                               if (!mh_strcasecmp(c2->c_name, c1->c_name)) {
-                                                       putcomp(c1, c2, ONECOMP);
-                                                       if (!(c1->c_flags & SPLIT))
-                                                               break;
-                                               }
+                                               if (c2->c_flags & EXTRA)
+                                                       putcomp(c1, c2, TWOCOMP);
+                                       continue;
                                }
-                               return;
+                               if (dobody && !mh_strcasecmp(c1->c_name, "body")) {
+                                       holder.c_text = mh_xmalloc(sizeof(buf));
+                                       strncpy(holder.c_text, buf, sizeof(buf));
+                                       while (state == BODY) {
+                                               putcomp(c1, &holder, BODYCOMP);
+                                               state = m_getfld(state, name, holder.c_text, sizeof(buf), fp);
+                                       }
+                                       free(holder.c_text);
+                                       holder.c_text = NULL;
+                                       continue;
+                               }
+                               for (c2 = msghd; c2; c2 = c2->c_next)
+                                       if (!mh_strcasecmp(c2->c_name,
+                                                       c1->c_name)) {
+                                               putcomp(c1, c2, ONECOMP);
+                                               if (!(c1->c_flags & SPLIT))
+                                                       break;
+                                       }
+                       }
+                       return;
 
-                       case LENERR:
-                       case FMTERR:
-                               advise(NULL, "format error in message %s",
-                                               mname);
-                               exitstat++;
-                               return;
+               case LENERR:
+               case FMTERR:
+                       advise(NULL, "format error in message %s", mname);
+                       exitstat++;
+                       return;
 
-                       default:
-                               adios(NULL, "getfld() returned %d", state);
+               default:
+                       adios(NULL, "getfld() returned %d", state);
                }
        }
 }
@@ -1332,53 +1327,53 @@ putch(char ch)
                return;
 
        switch (ch) {
-               case '\n':
-                       if (llim > 0)
-                               llim--;
-                       column = 0;
-                       row++;
-                       if (ontty != ISTTY || row != global.c_length)
-                               break;
-                       if (global.c_flags & BELL)
-                               putchar('\007');
-                       fflush(stdout);
-                       buf[0] = 0;
-                       read(fileno(stdout), buf, sizeof(buf));
-                       if (strchr(buf, '\n')) {
-                               if (global.c_flags & CLEARSCR)
-                                       clear_screen();
-                               row = 0;
-                       } else {
-                               putchar('\n');
-                               row = global.c_length / 3;
-                       }
-                       return;
-
-               case '\t':
-                       column |= 07;
-                       column++;
-                       break;
-
-               case '\b':
-                       column--;
-                       break;
-
-               case '\r':
-                       column = 0;
+       case '\n':
+               if (llim > 0)
+                       llim--;
+               column = 0;
+               row++;
+               if (ontty != ISTTY || row != global.c_length)
                        break;
+               if (global.c_flags & BELL)
+                       putchar('\007');
+               fflush(stdout);
+               buf[0] = 0;
+               read(fileno(stdout), buf, sizeof(buf));
+               if (strchr(buf, '\n')) {
+                       if (global.c_flags & CLEARSCR)
+                               clear_screen();
+                       row = 0;
+               } else {
+                       putchar('\n');
+                       row = global.c_length / 3;
+               }
+               return;
 
-               default:
-                       /*
-                       ** 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 == '-') {
-                               putchar('-');
-                               putchar(' ');
-                       }
-                       if (ch >= ' ')
-                               column++;
-                       break;
+       case '\t':
+               column |= 07;
+               column++;
+               break;
+
+       case '\b':
+               column--;
+               break;
+
+       case '\r':
+               column = 0;
+               break;
+
+       default:
+               /*
+               ** If we are forwarding this message, and the first
+               ** column contains a dash, then add a dash and a space.
+               */
+               if (column == 0 && forwflg && ch == '-') {
+                       putchar('-');
+                       putchar(' ');
+               }
+               if (ch >= ' ')
+                       column++;
+               break;
        }
 
        if (column >= wid) {
@@ -1439,44 +1434,44 @@ mhlsbr(int argc, char **argv, FILE *(*action)())
        struct mcomp *c1;
 
        switch (setjmp(mhlenv)) {
-               case OK:
-                       cp = invo_name;
-                       sleepsw = 0;  /* XXX */
-                       bellflg = clearflg = forwflg = forwall = exitstat = 0;
-                       digest = NULL;
-                       ontty = NOTTY;
-                       mhl_action = action;
-
-                       /*
-                       ** If signal is at default action, then start ignoring
-                       ** it, else let it set to its current action.
-                       */
-                       if ((istat = SIGNAL(SIGINT, SIG_IGN)) != SIG_DFL)
-                               SIGNAL(SIGINT, istat);
-                       if ((qstat = SIGNAL(SIGQUIT, SIG_IGN)) != SIG_DFL)
-                               SIGNAL(SIGQUIT, qstat);
-                       pstat = SIGNAL(SIGPIPE, pipeser);
-                       mhl(argc, argv);  /* FALL THROUGH! */
+       case OK:
+               cp = invo_name;
+               sleepsw = 0;  /* XXX */
+               bellflg = clearflg = forwflg = forwall = exitstat = 0;
+               digest = NULL;
+               ontty = NOTTY;
+               mhl_action = action;
 
-               default:
+               /*
+               ** If signal is at default action, then start ignoring
+               ** it, else let it set to its current action.
+               */
+               if ((istat = SIGNAL(SIGINT, SIG_IGN)) != SIG_DFL)
                        SIGNAL(SIGINT, istat);
+               if ((qstat = SIGNAL(SIGQUIT, SIG_IGN)) != SIG_DFL)
                        SIGNAL(SIGQUIT, qstat);
-                       SIGNAL(SIGPIPE, SIG_IGN);  /*
-                                       ** should probably change to block
-                                       ** instead
-                                       */
-                       if (ontty == PITTY)
-                               m_pclose();
-                       SIGNAL(SIGPIPE, pstat);
-                       invo_name = cp;
-                       if (holder.c_text) {
-                               free(holder.c_text);
-                               holder.c_text = NULL;
-                       }
-                       free_queue(&msghd, &msgtl);
-                       for (c1 = fmthd; c1; c1 = c1->c_next)
-                               c1->c_flags &= ~HDROUTPUT;
-                       return exitstat;
+               pstat = SIGNAL(SIGPIPE, pipeser);
+               mhl(argc, argv);  /* FALL THROUGH! */
+
+       default:
+               SIGNAL(SIGINT, istat);
+               SIGNAL(SIGQUIT, qstat);
+               SIGNAL(SIGPIPE, SIG_IGN);  /*
+                               ** should probably change to block
+                               ** instead
+                               */
+               if (ontty == PITTY)
+                       m_pclose();
+               SIGNAL(SIGPIPE, pstat);
+               invo_name = cp;
+               if (holder.c_text) {
+                       free(holder.c_text);
+                       holder.c_text = NULL;
+               }
+               free_queue(&msghd, &msgtl);
+               for (c1 = fmthd; c1; c1 = c1->c_next)
+                       c1->c_flags &= ~HDROUTPUT;
+               return exitstat;
        }
 }
 
@@ -1520,30 +1515,30 @@ m_popen(char *name)
        if (pipe(pd) == NOTOK)
                adios("pipe", "unable to");
 
-       switch (m_pid = vfork()) {
-               case NOTOK:
-                       adios("fork", "unable to");
+       switch (m_pid = fork()) {
+       case NOTOK:
+               adios("fork", "unable to");
 
-               case OK:
-                       SIGNAL(SIGINT, SIG_DFL);
-                       SIGNAL(SIGQUIT, SIG_DFL);
+       case OK:
+               SIGNAL(SIGINT, SIG_DFL);
+               SIGNAL(SIGQUIT, SIG_DFL);
 
-                       close(pd[1]);
-                       if (pd[0] != fileno(stdin)) {
-                               dup2(pd[0], fileno(stdin));
-                               close(pd[0]);
-                       }
-                       execlp(name, mhbasename(name), NULL);
-                       fprintf(stderr, "unable to exec ");
-                       perror(name);
-                       _exit(-1);
-
-               default:
+               close(pd[1]);
+               if (pd[0] != fileno(stdin)) {
+                       dup2(pd[0], fileno(stdin));
                        close(pd[0]);
-                       if (pd[1] != fileno(stdout)) {
-                               dup2(pd[1], fileno(stdout));
-                               close(pd[1]);
-                       }
+               }
+               execlp(name, mhbasename(name), NULL);
+               fprintf(stderr, "unable to exec ");
+               perror(name);
+               _exit(-1);
+
+       default:
+               close(pd[0]);
+               if (pd[1] != fileno(stdout)) {
+                       dup2(pd[1], fileno(stdout));
+                       close(pd[1]);
+               }
        }
 }