X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/337b4e616e8f53ba06285b1645e1df9918ed5c16..b0aa8cdb1c264e42d4931ca24968689c73381278:/uip/forw.c

diff --git a/uip/forw.c b/uip/forw.c
index 12a323bb..5b4d9014 100644
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -211,7 +211,7 @@ main (int argc, char **argv)
 		case DGSTSW: 
 		    if (!(cp = *argp++) || *cp == '-')
 			adios (NULL, "missing argument to %s", argp[-2]);
-		    digest = getcpy(cp);
+		    digest = mh_xstrdup(cp);
 		    mime = 0;
 		    continue;
 		case ISSUESW:
@@ -276,7 +276,7 @@ main (int argc, char **argv)
 		case SUBJECTSW:
 		    if (!(cp = *argp++) || *cp == '-')
 			adios (NULL, "missing argument to %s", argp[-2]);
-		    subject = getcpy(cp);
+		    subject = mh_xstrdup(cp);
 		    continue;
 
 		case WIDTHSW:
@@ -297,7 +297,7 @@ main (int argc, char **argv)
 	}
     }
 
-    cwd = getcpy (pwd ());
+    cwd = mh_xstrdup(pwd ());
 
     if (!context_find ("path"))
 	free (path ("./", TFOLDER));
@@ -313,7 +313,8 @@ try_it_again:
     if (!buildsw && stat (drft, &st) != NOTOK) {
 	printf ("Draft \"%s\" exists (%ld bytes).", drft, (long) st.st_size);
 	for (i = LISTDSW; i != YESW;) {
-	    if (!(argp = getans ("\nDisposition? ", isdf ? aqrnl : aqrl)))
+	    if (!(argp = read_switch_multiword ("\nDisposition? ",
+						isdf ? aqrnl : aqrl)))
 		done (1);
 	    switch (i = smatch (*argp, isdf ? aqrnl : aqrl)) {
 		case NOSW: 
@@ -454,10 +455,10 @@ try_it_again:
 	if (digest) {
 	    snprintf (buf, sizeof(buf), IFORMAT, digest);
 	    snprintf (value, sizeof(value), "%d", issue);
-	    context_replace (buf, getcpy (value));
+	    context_replace (buf, mh_xstrdup(value));
 	    snprintf (buf, sizeof(buf), VFORMAT, digest);
 	    snprintf (value, sizeof(value), "%d", volume);
-	    context_replace (buf, getcpy (value));
+	    context_replace (buf, mh_xstrdup(value));
 	}
 
 	context_replace (pfolder, folder);	/* update current folder   */
@@ -536,7 +537,7 @@ mhl_draft (int out, char *digest, int volume, int issue,
 
 	    for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
 		if (is_selected (mp, msgnum))
-		    app_msgarg(&vec, getcpy (m_name (msgnum)));
+		    app_msgarg(&vec, mh_xstrdup(m_name (msgnum)));
 	    }
 
 	    app_msgarg(&vec, NULL);
@@ -567,7 +568,7 @@ copy_draft (int out, char *digest, char *file, int volume, int issue, int dashst
 {
     int fd,i, msgcnt, msgnum;
     int len, buflen;
-    register char *bp, *msgnam;
+    char *bp, *msgnam;
     char buffer[BUFSIZ];
 
     msgcnt = 1;