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

diff --git a/uip/replsbr.c b/uip/replsbr.c
index 80d1ff67..a9a65969 100644
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -111,23 +111,23 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
     if (!ccto) {
 	cptr = fmt_findcomp ("to");
 	if (cptr)
-	    cptr->c_name = getcpy(NULL);
+	    cptr->c_name = mh_xstrdup("");
     }
     if (!cccc) {
 	 cptr = fmt_findcomp("cc");
 	if (cptr)
-	    cptr->c_name = getcpy(NULL);
+	    cptr->c_name = mh_xstrdup("");
     }
     /* set up the "fcc" pseudo-component */
     if (fcc) {
 	cptr = fmt_findcomp ("fcc");
 	if (cptr)
-	    cptr->c_text = getcpy (fcc);
+	    cptr->c_text = mh_xstrdup(fcc);
     }
     if ((cp = getenv("USER"))) {
 	cptr = fmt_findcomp ("user");
 	if (cptr)
-	    cptr->c_text = getcpy(cp);
+	    cptr->c_text = mh_xstrdup(cp);
     }
     if (!ccme)
 	ismymbox (NULL);
@@ -200,7 +200,7 @@ finished:
 	}
 	if (sp != cptr->c_text) {
 	    cp = cptr->c_text;
-	    cptr->c_text = getcpy (sp);
+	    cptr->c_text = mh_xstrdup(sp);
 	    free (cp);
 	}
     }
@@ -609,8 +609,7 @@ fix_addresses (char *str) {
 
     if (fixed_address) {
         return fixed_str;
-    } else {
-        free (fixed_str);
-        return str  ?  strdup (str)  :  NULL;
     }
+    free (fixed_str);
+    return str  ?  strdup (str)  :  NULL;
 }