X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/9748d5591651713f88af307f5bfbf7c0cbd50db1..ea855e72d026c72658d43f993fc62cfcf2de2ca3:/uip/replsbr.c

diff --git a/uip/replsbr.c b/uip/replsbr.c
index 3557c9ec..6a906b44 100644
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -317,7 +317,7 @@ replformataddr (char *orig, char *str)
 
     /* concatenate all the new addresses onto 'buf' */
     for (isgroup = 0; (cp = getname (fixed_str)); ) {
-	if ((mp = getm (cp, dfhost, dftype, AD_NAME, error)) == NULL) {
+	if ((mp = getm (cp, dfhost, dftype, error, sizeof(error))) == NULL) {
 	    snprintf (baddr, sizeof(baddr), "\t%s -- %s\n", cp, error);
 	    badaddrs = add (baddr, badaddrs);
 	    continue;
@@ -434,6 +434,8 @@ replfilter (FILE *in, FILE *out, char *filter, int fmtproc)
     rewind (in);
     lseek (fileno(in), (off_t) 0, SEEK_SET);
 
+    arglist = argsplit(mhlproc, &mhl, &argnum);
+
     switch (pid = fork()) {
 	case NOTOK: 
 	    adios ("fork", "unable to");
@@ -448,7 +450,6 @@ replfilter (FILE *in, FILE *out, char *filter, int fmtproc)
 	     * because we never call arglist_free().  But if we ever change
 	     * that be sure to use getcpy() for the extra arguments.
 	     */
-	    arglist = argsplit(mhlproc, &mhl, &argnum);
 	    arglist[argnum++] = "-form";
 	    arglist[argnum++] = filter;
 	    arglist[argnum++] = "-noclear";
@@ -522,7 +523,8 @@ fix_addresses (char *str) {
             adr_nodep->next = NULL;
 
             /* With AD_NAME, errors are not reported to user. */
-            if ((mp = getm (cp, dfhost, dftype, AD_NAME, error)) == NULL) {
+            if ((mp = getm (cp, dfhost, dftype, error,
+	    		    sizeof(error))) == NULL) {
                 const char *no_at_sign = "no at-sign after local-part";
 
                 adr_nodep->escape_local_part =
@@ -561,7 +563,7 @@ fix_addresses (char *str) {
                 new_adr = concat (display_name, " ", angle_addr, NULL);
                 adr = getname (new_adr);
                 if (adr != NULL  &&
-                    (mp = getm (adr, dfhost, dftype, AD_NAME, NULL)) != NULL) {
+                    (mp = getm (adr, dfhost, dftype, NULL, 0)) != NULL) {
                     fixed_address = 1;
                     mnfree (mp);
                 }