X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/b14d14e3d08c4b677d2d051731b934da20debf99..98782146f689a059d5e81636ff2ab55babc2e8ff:/uip/replsbr.c

diff --git a/uip/replsbr.c b/uip/replsbr.c
index a9a65969..9e3183e4 100644
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -1,6 +1,4 @@
-
-/*
- * replsbr.c -- routines to help repl along...
+/* replsbr.c -- routines to help repl along...
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -104,9 +102,6 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
      *
      * This prevents the component from being found via fmt_findcomp(),
      * which makes sure no text gets added to it when the message is processed.
-     *
-     * getcpy(NULL) returns a malloc'd zero-length string, so it can safely
-     * be free()'d later.
      */
     if (!ccto) {
 	cptr = fmt_findcomp ("to");
@@ -118,17 +113,6 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
 	if (cptr)
 	    cptr->c_name = mh_xstrdup("");
     }
-    /* set up the "fcc" pseudo-component */
-    if (fcc) {
-	cptr = fmt_findcomp ("fcc");
-	if (cptr)
-	    cptr->c_text = mh_xstrdup(fcc);
-    }
-    if ((cp = getenv("USER"))) {
-	cptr = fmt_findcomp ("user");
-	if (cptr)
-	    cptr->c_text = mh_xstrdup(cp);
-    }
     if (!ccme)
 	ismymbox (NULL);
 
@@ -139,8 +123,8 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
 	int msg_count = sizeof tmpbuf;
 	state = m_getfld (&gstate, name, tmpbuf, &msg_count, inb);
 	switch (state) {
-	    case FLD: 
-	    case FLDPLUS: 
+	    case FLD:
+	    case FLDPLUS:
 		/*
 		 * if we're interested in this component, save a pointer
 		 * to the component text, then start using our next free
@@ -165,13 +149,13 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
 		}
 		break;
 
-	    case LENERR: 
-	    case FMTERR: 
-	    case BODY: 
+	    case LENERR:
+	    case FMTERR:
+	    case BODY:
 	    case FILEEOF:
 		goto finished;
 
-	    default: 
+	    default:
 		adios (NULL, "m_getfld() returned %d", state);
 	}
     }
@@ -182,6 +166,24 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
 finished:
     m_getfld_state_destroy (&gstate);
 
+    /* set up the "fcc" pseudo-component */
+    cptr = fmt_findcomp ("fcc");
+    if (cptr) {
+	mh_xfree(cptr->c_text);
+	if (fcc)
+	    cptr->c_text = mh_xstrdup(fcc);
+	else
+	    cptr->c_text = NULL;
+    }
+    cptr = fmt_findcomp ("user");
+    if (cptr) {
+	mh_xfree(cptr->c_text);
+	if ((cp = getenv("USER")))
+	    cptr->c_text = mh_xstrdup(cp);
+	else
+	    cptr = NULL;
+    }
+
     /*
      * if there's a "Subject" component, strip any "Re:"s off it
      */
@@ -438,10 +440,10 @@ replfilter (FILE *in, FILE *out, char *filter, int fmtproc)
     arglist = argsplit(mhlproc, &mhl, &argnum);
 
     switch (pid = fork()) {
-	case NOTOK: 
+	case NOTOK:
 	    adios ("fork", "unable to");
 
-	case OK: 
+	case OK:
 	    dup2 (fileno (in), fileno (stdin));
 	    dup2 (fileno (out), fileno (stdout));
 	    closefds (3);
@@ -478,7 +480,7 @@ replfilter (FILE *in, FILE *out, char *filter, int fmtproc)
 	    }
 	    _exit (-1);
 
-	default: 
+	default:
 	    if (pidXwait (pid, mhl))
 		done (1);
 	    fseek (out, 0L, SEEK_END);
@@ -521,7 +523,7 @@ fix_addresses (char *str) {
             struct mailname *mp;
 
             NEW(adr_nodep);
-            adr_nodep->adr = strdup (cp);
+            adr_nodep->adr = mh_xstrdup (cp);
             adr_nodep->escape_local_part = 0;
             adr_nodep->fixed = 0;
             adr_nodep->next = NULL;
@@ -532,7 +534,7 @@ fix_addresses (char *str) {
                 const char *no_at_sign = "no at-sign after local-part";
 
                 adr_nodep->escape_local_part =
-                    ! strncmp (error, no_at_sign, strlen (no_at_sign));
+                    has_prefix(error, no_at_sign);
             } else {
                 mnfree (mp);
             }
@@ -548,12 +550,12 @@ fix_addresses (char *str) {
          * Walk the list and try to fix broken addresses.
          */
         for (np = adrs; np; np = np->next) {
-            char *display_name = strdup (np->adr);
+            char *display_name = mh_xstrdup (np->adr);
             size_t len = strlen (display_name);
 
             if (np->escape_local_part) {
                 char *local_part_end = strrchr (display_name, '<');
-                char *angle_addr = strdup (local_part_end);
+                char *angle_addr = mh_xstrdup (local_part_end);
                 struct mailname *mp;
                 char *new_adr, *adr;
 
@@ -574,7 +576,7 @@ fix_addresses (char *str) {
                 free (angle_addr);
                 free (new_adr);
                 free (np->adr);
-                np->adr = strdup (adr);
+                np->adr = mh_xstrdup (adr);
 
                 /* Need to flush getname() */
                 while ((cp = getname (""))) continue;
@@ -597,7 +599,7 @@ fix_addresses (char *str) {
                     free (fixed_str);
                     fixed_str = new_str;
                 } else {
-                    fixed_str = strdup (np->adr);
+                    fixed_str = mh_xstrdup (np->adr);
                 }
             }
 
@@ -611,5 +613,5 @@ fix_addresses (char *str) {
         return fixed_str;
     }
     free (fixed_str);
-    return str  ?  strdup (str)  :  NULL;
+    return str  ?  mh_xstrdup (str)  :  NULL;
 }