X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a57e5d9907d845d6f83d2cfdea55cd52efad793f..9322ba2854211794c27fae9468768b80b767c211:/uip/replsbr.c

diff --git a/uip/replsbr.c b/uip/replsbr.c
index c4ca0c4b..15cab6c0 100644
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -65,11 +65,11 @@ void
 replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
 	int mime, char *form, char *filter, char *fcc, int fmtproc)
 {
-    register int state, i;
-    register struct comp *cptr;
+    int state, i;
+    struct comp *cptr;
     char tmpbuf[SBUFSIZ];
     struct format *fmt;
-    register char **ap;
+    char **ap;
     int	char_read = 0, format_len, mask;
     char name[NAMESZ], *cp;
     charstring_t scanl;
@@ -104,30 +104,16 @@ 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");
 	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);
-    }
-    /* set up the "fcc" pseudo-component */
-    if (fcc) {
-	cptr = fmt_findcomp ("fcc");
-	if (cptr)
-	    cptr->c_text = getcpy (fcc);
-    }
-    if ((cp = getenv("USER"))) {
-	cptr = fmt_findcomp ("user");
-	if (cptr)
-	    cptr->c_text = getcpy(cp);
+	    cptr->c_name = mh_xstrdup("");
     }
     if (!ccme)
 	ismymbox (NULL);
@@ -139,8 +125,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 +151,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,12 +168,30 @@ 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
      */
     cptr = fmt_findcomp ("subject");
     if (cptr && (cp = cptr->c_text)) {
-	register char *sp = cp;
+	char *sp = cp;
 
 	for (;;) {
 	    while (isspace((unsigned char) *cp))
@@ -200,7 +204,7 @@ finished:
 	}
 	if (sp != cptr->c_text) {
 	    cp = cptr->c_text;
-	    cptr->c_text = getcpy (sp);
+	    cptr->c_text = mh_xstrdup(sp);
 	    free (cp);
 	}
     }
@@ -285,13 +289,13 @@ static unsigned int bufsiz=0;	/* current size of buf */
 static char *
 replformataddr (char *orig, char *str)
 {
-    register int len;
+    int len;
     char baddr[BUFSIZ], error[BUFSIZ];
-    register int isgroup;
-    register char *dst;
-    register char *cp;
-    register char *sp;
-    register struct mailname *mp = NULL;
+    int isgroup;
+    char *dst;
+    char *cp;
+    char *sp;
+    struct mailname *mp = NULL;
     char *fixed_str = fix_addresses (str);
 
     /* if we don't have a buffer yet, get one */
@@ -382,7 +386,7 @@ static int
 insert (struct mailname *np)
 {
     char buffer[BUFSIZ];
-    register struct mailname *mp;
+    struct mailname *mp;
 
     if (nodupcheck)
 	return 1;
@@ -402,7 +406,7 @@ insert (struct mailname *np)
 
     if (querysw) {
 	snprintf (buffer, sizeof(buffer), "Reply to %s? ", adrformat (np));
-	if (!gans (buffer, anoyes))
+	if (!read_switch (buffer, anoyes))
 	return 0;
     }
     mp->m_next = np;
@@ -438,10 +442,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 +482,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);
@@ -516,10 +520,11 @@ fix_addresses (char *str) {
          * local part.
          */
         while ((cp = getname (str))) {
-            struct adr_node *adr_nodep = mh_xmalloc (sizeof *adr_nodep);
+            struct adr_node *adr_nodep;
             char error[BUFSIZ];
             struct mailname *mp;
 
+            NEW(adr_nodep);
             adr_nodep->adr = strdup (cp);
             adr_nodep->escape_local_part = 0;
             adr_nodep->fixed = 0;
@@ -531,7 +536,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);
             }
@@ -608,8 +613,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;
 }