Display the command when reporting timing.

[nmh] / uip / replsbr.c

diff --git a/uip/replsbr.c b/uip/replsbr.c
index e63ce75519191b037041055dacfd28c7d9099818..46742e66a1d8d9c55ab0a46c797fa6632796bdc4 100644 (file)
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -8,6 +8,7 @@
 #include <h/mh.h>
 #include <h/addrsbr.h>
 #include <h/fmt_scan.h>
+#include "h/done.h"
 #include <h/utils.h>
 #include <sys/file.h>          /* L_SET */
 
@@ -22,7 +23,7 @@ static char *badaddrs = NULL;
 static char *dfhost = NULL;
 
 static struct mailname mq;
-static int nodupcheck = 0;             /* If set, no check for duplicates */
+static bool nodupcheck;                /* If set, no check for duplicates */
 
 static char *addrcomps[] = {
     "from",
@@ -63,7 +64,7 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
     char name[NAMESZ], *cp;
     charstring_t scanl;
     static int dat[5];                 /* aux. data for format routine */
-    m_getfld_state_t gstate = 0;
+    m_getfld_state_t gstate;
     struct fmt_callbacks cb;
 
     FILE *out;
@@ -110,9 +111,10 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
     /*
      * pick any interesting stuff out of msg "inb"
      */
+    gstate = m_getfld_state_init(inb);
     for (;;) {
        int msg_count = sizeof tmpbuf;
-       state = m_getfld (&gstate, name, tmpbuf, &msg_count, inb);
+       state = m_getfld2(&gstate, name, tmpbuf, &msg_count);
        switch (state) {
            case FLD:
            case FLDPLUS:
@@ -128,7 +130,7 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
                    char_read += msg_count;
                    while (state == FLDPLUS) {
                        msg_count= sizeof tmpbuf;
-                       state = m_getfld (&gstate, name, tmpbuf, &msg_count, inb);
+                       state = m_getfld2(&gstate, name, tmpbuf, &msg_count);
                        fmt_appendcomp(i, name, tmpbuf);
                        char_read += msg_count;
                    }
@@ -136,7 +138,7 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
 
                while (state == FLDPLUS) {
                    msg_count= sizeof tmpbuf;
-                   state = m_getfld (&gstate, name, tmpbuf, &msg_count, inb);
+                   state = m_getfld2(&gstate, name, tmpbuf, &msg_count);
                }
                break;
 
@@ -147,7 +149,7 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
                goto finished;
 
            default:
-               adios (NULL, "m_getfld() returned %d", state);
+               die("m_getfld2() returned %d", state);
        }
     }
 
@@ -160,7 +162,7 @@ finished:
     /* set up the "fcc" pseudo-component */
     cptr = fmt_findcomp ("fcc");
     if (cptr) {
-       mh_xfree(cptr->c_text);
+       free(cptr->c_text);
        if (fcc)
            cptr->c_text = mh_xstrdup(fcc);
        else
@@ -168,7 +170,7 @@ finished:
     }
     cptr = fmt_findcomp ("user");
     if (cptr) {
-       mh_xfree(cptr->c_text);
+       free(cptr->c_text);
        if ((cp = getenv("USER")))
            cptr->c_text = mh_xstrdup(cp);
        else
@@ -204,7 +206,7 @@ finished:
     dat[2] = 0;
     dat[3] = outputlinelen;
     dat[4] = 0;
-    memset(&cb, 0, sizeof(cb));
+    ZERO(&cb);
     cb.formataddr = replformataddr;
     cb.concataddr = replconcataddr;
     fmt_scan (fmt, scanl, i, dat, &cb);
@@ -344,7 +346,7 @@ replformataddr (char *orig, char *str)
 
     *dst = '\0';
     last_dst = dst;
-    return (buf);
+    return buf;
 }
 
 
@@ -365,9 +367,9 @@ replconcataddr(char *orig, char *str)
 {
     char *cp;
 
-    nodupcheck = 1;
+    nodupcheck = true;
     cp = replformataddr(orig, str);
-    nodupcheck = 0;
+    nodupcheck = false;
     return cp;
 }
 
@@ -469,12 +471,13 @@ replfilter (FILE *in, FILE *out, char *filter, int fmtproc)
                write(2, "\n", 1) < 0) {
                advise ("stderr", "write");
            }
-           _exit (-1);
+           _exit(1);
 
        default:
            if (pidXwait (pid, mhl))
                done (1);
            fseek (out, 0L, SEEK_END);
+            arglist_free(mhl, arglist);
            break;
     }
 }
@@ -484,7 +487,7 @@ static
 char *
 fix_addresses (char *str) {
     char *fixed_str = NULL;
-    int fixed_address = 0;
+    bool fixed_address = false;
 
     if (str) {
         /*
@@ -561,7 +564,7 @@ fix_addresses (char *str) {
                 adr = getname (new_adr);
                 if (adr != NULL  &&
                     (mp = getm (adr, dfhost, dftype, NULL, 0)) != NULL) {
-                    fixed_address = 1;
+                    fixed_address = true;
                     mnfree (mp);
                 }
                 free (angle_addr);