X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/e0c39ed52fa9c99b4591b5170354d8398ffd787b..ef1ba39e8dae81091b6c3e73e72825ef6edea3c6:/uip/mhlsbr.c?ds=sidebyside

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index 3ebfa69e..02ba0bcc 100644
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -88,11 +88,12 @@ DEFINE_SWITCH_ARRAY(MHL, mhlswitches);
 #define	DATEFMT     0x000800	/* contains dates                    */
 #define	FORMAT      0x001000	/* parse address/date/RFC-2047 field */
 #define	INIT        0x002000	/* initialize component              */
+#define RTRIM       0x004000	/* trim trailing whitespace          */
 #define	SPLIT       0x010000	/* split headers (don't concatenate) */
 #define	NONEWLINE   0x020000	/* don't write trailing newline      */
 #define NOWRAP      0x040000	/* Don't wrap lines ever             */
 #define FMTFILTER   0x080000	/* Filter through format filter      */
-#define	LBITS	"\020\01NOCOMPONENT\02UPPERCASE\03CENTER\04CLEARTEXT\05EXTRA\06HDROUTPUT\07CLEARSCR\010LEFTADJUST\011COMPRESS\012ADDRFMT\013BELL\014DATEFMT\015FORMAT\016INIT\021SPLIT\022NONEWLINE\023NOWRAP\024FMTFILTER"
+#define	LBITS	"\020\01NOCOMPONENT\02UPPERCASE\03CENTER\04CLEARTEXT\05EXTRA\06HDROUTPUT\07CLEARSCR\010LEFTADJUST\011COMPRESS\012ADDRFMT\013BELL\014DATEFMT\015FORMAT\016INIT\017RTRIM\021SPLIT\022NONEWLINE\023NOWRAP\024FMTFILTER"
 #define	GFLAGS	(NOCOMPONENT | UPPERCASE | CENTER | LEFTADJUST | COMPRESS | SPLIT | NOWRAP)
 
 /*
@@ -221,6 +222,8 @@ static struct triple triples[] = {
     { "nocompress",    0,           COMPRESS },
     { "split",         SPLIT,       0 },
     { "nosplit",       0,           SPLIT },
+    { "rtrim",         RTRIM,       0 },
+    { "nortrim",       0,           RTRIM },
     { "addrfield",     ADDRFMT,     DATEFMT },
     { "bell",          BELL,        0 },
     { "nobell",        0,           BELL },
@@ -332,7 +335,6 @@ static void pipeser (int);
 static void quitser (int);
 static void mhladios (char *, char *, ...);
 static void mhldone (int);
-static void m_popen (char *);
 static void filterbody (struct mcomp *, char *, int, int, FILE *,
                         m_getfld_state_t);
 static void compile_formatfield(struct mcomp *);
@@ -401,7 +403,8 @@ mhl (int argc, char **argv)
 		case SLEEPSW:
 		    if (!(cp = *argp++) || *cp == '-')
 			adios (NULL, "missing argument to %s", argp[-2]);
-		    sleepsw = atoi (cp);/* ZERO ok! */
+		    else
+			sleepsw = atoi (cp);/* ZERO ok! */
 		    continue;
 
 		case PROGSW:
@@ -423,13 +426,13 @@ mhl (int argc, char **argv)
 		case LENSW: 
 		    if (!(cp = *argp++) || *cp == '-')
 			adios (NULL, "missing argument to %s", argp[-2]);
-		    if ((length = atoi (cp)) < 1)
+		    else 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)
+		    else if ((width = atoi (cp)) < 1)
 			adios (NULL, "bad argument %s %s", argp[-2], cp);
 		    continue;
 
@@ -440,13 +443,13 @@ mhl (int argc, char **argv)
 		case ISSUESW:
 		    if (!(cp = *argp++) || *cp == '-')
 			adios (NULL, "missing argument to %s", argp[-2]);
-		    if ((issue = atoi (cp)) < 1)
+		    else 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)
+		    else if ((volume = atoi (cp)) < 1)
 			adios (NULL, "bad argument %s %s", argp[-2], cp);
 		    continue;
 
@@ -482,7 +485,7 @@ mhl (int argc, char **argv)
 		SIGNAL2 (SIGQUIT, quitser);
 	    }
 	    SIGNAL2 (SIGPIPE, pipeser);
-	    m_popen (moreproc);
+	    m_popen (moreproc, mhl_action != NULL);
 	    ontty = PITTY;
 	} else {
 	    SIGNAL (SIGINT, SIG_IGN);
@@ -542,8 +545,8 @@ static void
 mhl_format (char *file, int length, int width)
 {
     int i;
-    char *bp, *cp, **ip;
-    char *ap, buffer[BUFSIZ], name[NAMESZ];
+    char *bp, **ip;
+    char *ap, name[NAMESZ];
     struct mcomp *c1;
     struct stat st;
     FILE *fp;
@@ -557,8 +560,7 @@ mhl_format (char *file, int length, int width)
 		&& dev == st.st_dev
 		&& ino == st.st_ino)
 	    goto out;
-	else
-	    free_queue (&fmthd, &fmttl);
+        free_queue (&fmthd, &fmttl);
     }
 
     if ((fp = fopen (etcpath (file), "r")) == NULL)
@@ -588,11 +590,10 @@ mhl_format (char *file, int length, int width)
 	if (*bp == ';')
 	    continue;
 
-	if ((cp = strchr(bp, '\n')))
-	    *cp = 0;
+        TrimSuffixC(bp, '\n');
 
 	if (*bp == ':') {
-	    c1 = add_queue (&fmthd, &fmttl, NULL, bp + 1, CLEARTEXT);
+	    (void) add_queue (&fmthd, &fmttl, NULL, bp + 1, CLEARTEXT);
 	    continue;
 	}
 
@@ -611,7 +612,7 @@ mhl_format (char *file, int length, int width)
 		    int n = 0;
 
 		    /* split the fields */
-		    tmparray = brkstring (getcpy (++parptr), ",", NULL);
+		    tmparray = brkstring (mh_xstrdup(++parptr), ",", NULL);
 
 		    /* count number of fields split */
 		    p = tmparray;
@@ -642,14 +643,14 @@ mhl_format (char *file, int length, int width)
 		if (!c1->c_nfs && global.c_nfs) {
 		    if (c1->c_flags & DATEFMT) {
 			if (global.c_flags & DATEFMT) {
-			    c1->c_nfs = getcpy (global.c_nfs);
+			    c1->c_nfs = mh_xstrdup(global.c_nfs);
 			    compile_formatfield(c1);
 			}
 		    }
 		    else
 			if (c1->c_flags & ADDRFMT) {
 			    if (global.c_flags & ADDRFMT) {
-				c1->c_nfs = getcpy (global.c_nfs);
+				c1->c_nfs = mh_xstrdup(global.c_nfs);
 				compile_formatfield(c1);
 			    }
 			}
@@ -664,6 +665,8 @@ mhl_format (char *file, int length, int width)
 
     if (mhldebug) {
 	for (c1 = fmthd; c1; c1 = c1->c_next) {
+	    char buffer[BUFSIZ];
+
 	    fprintf (stderr, "c1: name=\"%s\" text=\"%s\" ovtxt=\"%s\"\n",
 		    c1->c_name, c1->c_text, c1->c_ovtxt);
 	    fprintf (stderr, "\tnfs=0x%x fmt=0x%x\n",
@@ -773,7 +776,7 @@ evalvar (struct mcomp *c1)
 	    return 1;
 	}
 
-	args = (struct arglist *) calloc((size_t) 1, sizeof(struct arglist));
+	NEW0(args);
 
 	if (arglist_tail)
 	    arglist_tail->a_next = args;
@@ -831,7 +834,7 @@ ptos (char *name, char **s)
     }
     c = *parptr;
     *parptr = 0;
-    *s = getcpy (cp);
+    *s = mh_xstrdup(cp);
     if ((*parptr = c) == '"')
 	parptr++;
     return 0;
@@ -870,14 +873,18 @@ parse (void)
 static void
 process (char *folder, char *fname, int ofilen, int ofilec)
 {
-    char *cp = NULL;
-    FILE *fp = NULL;
+    /* static to prevent "might be clobbered" warning from gcc 4.9.2: */
+    static char *cp;
+    static FILE *fp;
     struct mcomp *c1;
     struct stat st;
     struct arglist *ap;
     /* volatile to prevent "might be clobbered" warning from gcc: */
     char *volatile fname2 = fname ? fname : "(stdin)";
 
+    cp = NULL;
+    fp = NULL;
+
     switch (setjmp (env)) {
 	case OK: 
 	    if (fname) {
@@ -895,10 +902,11 @@ process (char *folder, char *fname, int ofilen, int ofilec)
 	    } else {
 	    	filesize = 0;
 	    }
-	    cp = folder ? concat (folder, ":", fname2, NULL) : getcpy (fname2);
+	    cp = folder ? concat (folder, ":", fname2, NULL) : mh_xstrdup(fname2);
 	    if (ontty != PITTY)
 		SIGNAL (SIGINT, intrser);
 	    mhlfile (fp, cp, ofilen, ofilec);  /* FALL THROUGH! */
+            free (cp);
 
 	    for (ap = arglist_head; ap; ap = ap->a_next) {
 	    	fmt_free(ap->a_fmt, 0);
@@ -908,16 +916,13 @@ process (char *folder, char *fname, int ofilen, int ofilec)
 	    if (arglist_head)
 	    	fmt_free(NULL, 1);
 
-	default: 
+	default:
 	    if (ontty != PITTY)
 		SIGNAL (SIGINT, SIG_IGN);
-	    if (mhl_action == NULL && fp != stdin)
+	    if (mhl_action == NULL && fp != stdin && fp != NULL)
 		fclose (fp);
-	    free (cp);
-	    if (holder.c_text) {
-		free (holder.c_text);
-		holder.c_text = NULL;
-	    }
+            mh_xfree(holder.c_text);
+            holder.c_text = NULL;
 	    free_queue (&msghd, &msgtl);
 	    for (c1 = fmthd; c1; c1 = c1->c_next)
 		c1->c_flags &= ~HDROUTPUT;
@@ -972,14 +977,16 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
 		    }
 		    fflush (stdout);
 		    buf[0] = 0;
-		    read (fileno (stdout), buf, sizeof(buf));
+		    if (read (fileno (stdout), buf, sizeof(buf)) < 0) {
+			advise ("stdout", "read");
+		    }
 		}
 		if (strchr(buf, '\n')) {
 		    if ((global.c_flags & CLEARSCR))
 			nmh_clear_screen ();
 		}
 		else
-		    printf ("\n");
+		    putchar('\n');
 		break;
 
 	    default: 
@@ -1144,7 +1151,7 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2)
 {
     int dat[5];
     char *ap, *cp;
-    char buffer[BUFSIZ], error[BUFSIZ];
+    char error[BUFSIZ];
     struct pqpair *p, *q;
     struct pqpair pq;
     struct mailname *mp;
@@ -1154,20 +1161,22 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2)
     dat[0] = 0;
     dat[1] = 0;
     dat[2] = filesize;
-    dat[3] = sizeof(buffer) - 1;
+    dat[3] = BUFSIZ - 1;
     dat[4] = 0;
 
     if (!(c1->c_flags & ADDRFMT)) {
+	charstring_t scanl = charstring_create (BUFSIZ);
+
 	if (c1->c_c_text)
 	    c1->c_c_text->c_text = ap;
 	if ((cp = strrchr(ap, '\n')))	/* drop ending newline */
 	    if (!cp[1])
 		*cp = 0;
 
-	fmt_scan (c1->c_fmt, buffer, sizeof buffer - 1, sizeof buffer - 1,
-		  dat, NULL);
+	fmt_scan (c1->c_fmt, scanl, BUFSIZ - 1, dat, NULL);
 	/* Don't need to append a newline, dctime() already did */
-	c2->c_text = getcpy (buffer);
+	c2->c_text = charstring_buffer_copy (scanl);
+	charstring_free (scanl);
 
 	/* ap is now owned by the component struct, so do NOT free it here */
 	return;
@@ -1175,20 +1184,21 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2)
 
     (q = &pq)->pq_next = NULL;
     while ((cp = getname (ap))) {
-	if ((p = (struct pqpair *) calloc ((size_t) 1, sizeof(*p))) == NULL)
-	    adios (NULL, "unable to allocate pqpair memory");
-
-	if ((mp = getm (cp, NULL, 0, error, sizeof(error))) == NULL) {
-	    p->pq_text = getcpy (cp);
-	    p->pq_error = getcpy (error);
-	} else {
-	    p->pq_text = getcpy (mp->m_text);
-	    mnfree (mp);
-	}
-	q = (q->pq_next = p);
+	NEW0(p);
+        if ((mp = getm (cp, NULL, 0, error, sizeof(error))) == NULL) {
+            p->pq_text = mh_xstrdup(cp);
+            p->pq_error = mh_xstrdup(error);
+        } else {
+            p->pq_text = getcpy (mp->m_text);
+            mnfree (mp);
+        }
+        q = (q->pq_next = p);
     }
 
     for (p = pq.pq_next; p; p = q) {
+	charstring_t scanl = charstring_create (BUFSIZ);
+	char *buffer;
+
 	if (c1->c_c_text) {
 	    c1->c_c_text->c_text = p->pq_text;
 	    p->pq_text = NULL;
@@ -1198,8 +1208,8 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2)
 	    p->pq_error = NULL;
 	}
 
-	fmt_scan (c1->c_fmt, buffer, sizeof buffer - 1, sizeof buffer - 1,
-		  dat, NULL);
+	fmt_scan (c1->c_fmt, scanl, BUFSIZ - 1, dat, NULL);
+	buffer = charstring_buffer_copy (scanl);
 	if (*buffer) {
 	    if (c2->c_text)
 		c2->c_text = add (",\n", c2->c_text);
@@ -1207,13 +1217,12 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2)
 		*cp = 0;
 	    c2->c_text = add (buffer, c2->c_text);
 	}
+	charstring_free (scanl);
 
-	if (p->pq_text)
-	    free (p->pq_text);
-	if (p->pq_error)
-	    free (p->pq_error);
+        mh_xfree(p->pq_text);
+        mh_xfree(p->pq_error);
 	q = p->pq_next;
-	free ((char *) p);
+	free(p);
     }
 
     c2->c_text = add ("\n", c2->c_text);
@@ -1226,21 +1235,19 @@ add_queue (struct mcomp **head, struct mcomp **tail, char *name, char *text, int
 {
     struct mcomp *c1;
 
-    if ((c1 = (struct mcomp *) calloc ((size_t) 1, sizeof(*c1))) == NULL)
-	adios (NULL, "unable to allocate comp memory");
-
+    NEW0(c1);
     c1->c_flags = flags & ~INIT;
-    if ((c1->c_name = name ? getcpy (name) : NULL))
-	c1->c_flags |= mcomp_flags (c1->c_name);
-    c1->c_text = text ? getcpy (text) : NULL;
+    if ((c1->c_name = name ? mh_xstrdup(name) : NULL))
+        c1->c_flags |= mcomp_flags (c1->c_name);
+    c1->c_text = text ? mh_xstrdup(text) : NULL;
     if (flags & INIT) {
-	if (global.c_ovtxt)
-	    c1->c_ovtxt = getcpy (global.c_ovtxt);
-	c1->c_offset = global.c_offset;
-	c1->c_ovoff = global. c_ovoff;
-	c1->c_width = c1->c_length = 0;
-	c1->c_cwidth = global.c_cwidth;
-	c1->c_flags |= global.c_flags & GFLAGS;
+        if (global.c_ovtxt)
+            c1->c_ovtxt = mh_xstrdup(global.c_ovtxt);
+        c1->c_offset = global.c_offset;
+        c1->c_ovoff = global. c_ovoff;
+        c1->c_width = c1->c_length = 0;
+        c1->c_cwidth = global.c_cwidth;
+        c1->c_flags |= global.c_flags & GFLAGS;
     }
     if (*head == NULL)
 	*head = c1;
@@ -1259,17 +1266,13 @@ free_queue (struct mcomp **head, struct mcomp **tail)
 
     for (c1 = *head; c1; c1 = c2) {
 	c2 = c1->c_next;
-	if (c1->c_name)
-	    free (c1->c_name);
-	if (c1->c_text)
-	    free (c1->c_text);
-	if (c1->c_ovtxt)
-	    free (c1->c_ovtxt);
-	if (c1->c_nfs)
-	    free (c1->c_nfs);
+        mh_xfree(c1->c_name);
+        mh_xfree(c1->c_text);
+        mh_xfree(c1->c_ovtxt);
+        mh_xfree(c1->c_nfs);
 	if (c1->c_fmt)
 	    fmt_free (c1->c_fmt, 0);
-	free ((char *) c1);
+	free(c1);
     }
 
     *head = *tail = NULL;
@@ -1279,9 +1282,16 @@ free_queue (struct mcomp **head, struct mcomp **tail)
 static void
 putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 {
+    char *text; /* c1's text, or the name as a fallback. */
+    char *trimmed_prefix;
     int count, cchdr;
     char *cp;
 
+    text = c1->c_text ? c1->c_text : c1->c_name;
+    /* Create a copy with trailing whitespace trimmed, for use with
+     * blank lines. */
+    trimmed_prefix = rtrim(add(text, NULL));
+
     cchdr = 0;
     lm = 0;
     llim = c1->c_length ? c1->c_length : -1;
@@ -1296,7 +1306,8 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
     onelp = NULL;
 
     if (c1->c_flags & CLEARTEXT) {
-	putstr (c1->c_text, c1->c_flags);
+	putstr (c1->c_flags & RTRIM ? rtrim (c1->c_text) : c1->c_text,
+		c1->c_flags);
 	putstr ("\n", c1->c_flags);
 	return;
     }
@@ -1308,7 +1319,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 	count = (c1->c_width ? c1->c_width : global.c_width)
 	    - c1->c_offset - strlen (c2->c_text);
 	if (!(c1->c_flags & HDROUTPUT) && !(c1->c_flags & NOCOMPONENT))
-	    count -= strlen (c1->c_text ? c1->c_text : c1->c_name) + 2;
+	    count -= strlen(text) + 2;
 	lm = c1->c_offset + (count / 2);
     } else {
 	if (c1->c_offset)
@@ -1317,18 +1328,15 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 
     if (!(c1->c_flags & HDROUTPUT) && !(c1->c_flags & NOCOMPONENT)) {
         if (c1->c_flags & UPPERCASE)		/* uppercase component also */
-	    for (cp = (c1->c_text ? c1->c_text : c1->c_name); *cp; cp++)
-	        if (islower ((unsigned char) *cp))
-		    *cp = toupper ((unsigned char) *cp);
-	putstr (c1->c_text ? c1->c_text : c1->c_name, c1->c_flags);
+            ToUpper(text);
+	putstr(text, c1->c_flags);
 	if (flag != BODYCOMP) {
 	    putstr (": ", c1->c_flags);
 	    if (!(c1->c_flags & SPLIT))
 		c1->c_flags |= HDROUTPUT;
 
 	cchdr++;
-	if ((count = c1->c_cwidth -
-		strlen (c1->c_text ? c1->c_text : c1->c_name) - 2) > 0)
+	if ((count = c1->c_cwidth - strlen(text) - 2) > 0)
 	    while (count--)
 		putstr (" ", c1->c_flags);
 	}
@@ -1340,9 +1348,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 	    && !(c2->c_flags & HDROUTPUT)
 	    && !(c2->c_flags & NOCOMPONENT)) {
         if (c1->c_flags & UPPERCASE)
-	    for (cp = c2->c_name; *cp; cp++)
-	        if (islower ((unsigned char) *cp))
-		    *cp = toupper ((unsigned char) *cp);
+            ToUpper(c2->c_name);
 	putstr (c2->c_name, c1->c_flags);
 	putstr (": ", c1->c_flags);
 	if (!(c1->c_flags & SPLIT))
@@ -1354,9 +1360,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 		putstr (" ", c1->c_flags);
     }
     if (c1->c_flags & UPPERCASE)
-	for (cp = c2->c_text; *cp; cp++)
-	    if (islower ((unsigned char) *cp))
-		*cp = toupper ((unsigned char) *cp);
+        ToUpper(c2->c_text);
 
     count = 0;
     if (cchdr) {
@@ -1365,26 +1369,38 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 			: (int) strlen (c2->c_name) + 2;
 	else
 	    count = (c1->c_cwidth >= 0) ? (size_t) c1->c_cwidth
-			: strlen (c1->c_text ? c1->c_text : c1->c_name) + 2;
+			: strlen(text) + 2;
     }
     count += c1->c_offset;
 
     if ((cp = oneline (c2->c_text, c1->c_flags)))
-       putstr(cp, c1->c_flags);
+	/* Output line, trimming trailing whitespace if requested. */
+	putstr (c1->c_flags & RTRIM ? rtrim (cp) : cp, c1->c_flags);
     if (term == '\n')
 	putstr ("\n", c1->c_flags);
     while ((cp = oneline (c2->c_text, c1->c_flags))) {
 	lm = count;
 	if (flag == BODYCOMP
-		&& !(c1->c_flags & NOCOMPONENT))
-	    putstr (c1->c_text ? c1->c_text : c1->c_name, c1->c_flags);
-	if (*cp)
-	    putstr (cp, c1->c_flags);
+		&& !(c1->c_flags & NOCOMPONENT)) {
+	    /* Output component, trimming trailing whitespace if there
+	       is no text on the line. */
+	    if (*cp) {
+		putstr(text, c1->c_flags);
+	    } else {
+		putstr (trimmed_prefix, c1->c_flags);
+	    }
+	}
+	if (*cp) {
+	    /* Output line, trimming trailing whitespace if requested. */
+	    putstr (c1->c_flags & RTRIM ? rtrim (cp) : cp, c1->c_flags);
+        }
 	if (term == '\n')
 	    putstr ("\n", c1->c_flags);
     }
     if (flag == BODYCOMP && term == '\n')
 	c1->c_flags &= ~HDROUTPUT;		/* Buffer ended on a newline */
+
+    free (trimmed_prefix);
 }
 
 
@@ -1480,7 +1496,9 @@ putch (char ch, long flags)
 		putchar ('\007');
 	    fflush (stdout);
 	    buf[0] = 0;
-	    read (fileno (stdout), buf, sizeof(buf));
+	    if (read (fileno (stdout), buf, sizeof(buf)) < 0) {
+		advise ("stdout", "read");
+	    }
 	    if (strchr(buf, '\n')) {
 		if (global.c_flags & CLEARSCR)
 		    nmh_clear_screen ();
@@ -1562,62 +1580,6 @@ quitser (int i)
 }
 
 
-int
-mhlsbr (int argc, char **argv, FILE *(*action)())
-{
-    SIGNAL_HANDLER istat = NULL, pstat = NULL, qstat = NULL;
-    char *cp = NULL;
-    struct mcomp *c1;
-    struct arglist *a, *a2;
-
-    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! */
-
-	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;
-
-	    a = arglist_head;
-	    while (a) {
-	    	if (a->a_nfs)
-		    free(a->a_nfs);
-		a2 = a->a_next;
-		free(a);
-		a = a2;
-	    }
-	    return exitstat;
-    }
-}
-
 #undef adios
 #undef done
 
@@ -1644,74 +1606,6 @@ mhldone (int status)
 }
 
 
-static	int m_pid = NOTOK;
-static  int sd = NOTOK;
-
-static void
-m_popen (char *name)
-{
-    int pd[2];
-    char *file;
-    char **arglist;
-
-    if (mhl_action && (sd = dup (fileno (stdout))) == NOTOK)
-	adios ("standard output", "unable to dup()");
-
-    if (pipe (pd) == NOTOK)
-	adios ("pipe", "unable to");
-
-    switch (m_pid = fork()) {
-	case NOTOK: 
-	    adios ("fork", "unable to");
-
-	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]);
-	    }
-	    arglist = argsplit(name, &file, NULL);
-	    execvp (file, arglist);
-	    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]);
-	    }
-    }
-}
-
-
-void
-m_pclose (void)
-{
-    if (m_pid == NOTOK)
-	return;
-
-    if (sd != NOTOK) {
-	fflush (stdout);
-	if (dup2 (sd, fileno (stdout)) == NOTOK)
-	    adios ("standard output", "unable to dup2()");
-
-	clearerr (stdout);
-	close (sd);
-	sd = NOTOK;
-    }
-    else
-	fclose (stdout);
-
-    pidwait (m_pid, OK);
-    m_pid = NOTOK;
-}
-
-
 /*
  * Compile a format string used by the formatfield option and save it
  * for later.
@@ -1836,7 +1730,9 @@ filterbody (struct mcomp *c1, char *buf, int bufsz, int state, FILE *fp,
 
 	while (state == BODY) {
 	    int bufsz2 = bufsz;
-	    write(fdinput[1], buf, strlen(buf));
+	    if (write(fdinput[1], buf, strlen(buf)) < 0) {
+		advise ("pipe output", "write");
+	    }
 	    state = m_getfld (&gstate, name, buf, &bufsz2, fp);
 	}
 
@@ -1883,22 +1779,25 @@ filterbody (struct mcomp *c1, char *buf, int bufsz, int state, FILE *fp,
 	 */
 
 	for (a = arglist_head, i = argp; a != NULL; a = a->a_next, i++) {
-	    args[i] = mh_xmalloc(BUFSIZ);
-	    fmt_scan(a->a_fmt, args[i], BUFSIZ - 1, BUFSIZ, dat, NULL);
+	    charstring_t scanl = charstring_create (BUFSIZ);
+
+	    fmt_scan(a->a_fmt, scanl, BUFSIZ, dat, NULL);
+	    args[i] = charstring_buffer_copy (scanl);
+	    charstring_free (scanl);
 	    /*
 	     * fmt_scan likes to put a trailing newline at the end of the
 	     * format string.  If we have one, get rid of it.
 	     */
 	    s = strlen(args[i]);
 	    if (args[i][s - 1] == '\n')
-	    	args[i][s - 1] = '\0';
+		args[i][s - 1] = '\0';
 
 	    if (mhldebug)
-	    	fprintf(stderr, "filterarg: fmt=\"%s\", output=\"%s\"\n",
+		fprintf(stderr, "filterarg: fmt=\"%s\", output=\"%s\"\n",
 			a->a_nfs, args[i]);
 	}
 
-    	if (dup2(fdinput[0], STDIN_FILENO) < 0) {
+	if (dup2(fdinput[0], STDIN_FILENO) < 0) {
 	    adios("formatproc", "Unable to dup2() standard input");
 	}
 	if (dup2(fdoutput[1], STDOUT_FILENO) < 0) {