X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/ec18722d02bd307bd09f30715dc8ba4e1b8a6716..06812cb5cb0229200b5dc690a6365cf0a368a5f2:/uip/replsbr.c

diff --git a/uip/replsbr.c b/uip/replsbr.c
index d3ba2709..05997fdc 100644
--- 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 */
 
@@ -161,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
@@ -169,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
@@ -205,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);
@@ -345,7 +346,7 @@ replformataddr (char *orig, char *str)
 
     *dst = '\0';
     last_dst = dst;
-    return (buf);
+    return buf;
 }
 
 
@@ -470,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;
     }
 }