X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fforw.c;h=d8d69f7865049d1c23c24475e9555b80ea2adc7a;hp=c754b2789c66c3c48d79cf5583a600afa1fb0a55;hb=d4bcca1aa235370bc20bc2734c0cd6f700b17871;hpb=cf1205b5cbea2f0cd6ea710ec16c637df85b647c

diff --git a/uip/forw.c b/uip/forw.c
index c754b27..d8d69f7 100644
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -130,7 +130,6 @@ main(int argc, char **argv)
 				if (!(digest = *argp++) || *digest == '-')
 					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
-				//mime = 0;
 				continue;
 			case ISSUESW:
 				if (!(cp = *argp++) || *cp == '-')
@@ -154,13 +153,13 @@ main(int argc, char **argv)
 			if (folder)
 				adios(EX_USAGE, NULL, "only one folder at a time!");
 			else
-				folder = getcpy(expandfol(cp));
+				folder = mh_xstrdup(expandfol(cp));
 		} else {
 			msgs[msgp++] = cp;
 		}
 	}
 
-	cwd = getcpy(pwd());
+	cwd = mh_xstrdup(pwd());
 	strncpy(drft, buildsw ? toabsdir("draft") : m_draft(seq_beyond),
 			sizeof(drft));
 	/*
@@ -234,10 +233,10 @@ main(int argc, char **argv)
 	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(curfolder, folder); /* update current folder */
@@ -297,10 +296,10 @@ build_form(char *form, char *digest, int volume, int issue)
 {
 	int in;
 	int fmtsize;
-	register char *fmtstr;
+	char *fmtstr;
 	char *line, tmpfil[BUFSIZ];
 	FILE *tmp;
-	register struct comp *cptr;
+	struct comp *cptr;
 	struct format *fmt;
 	int dat[5];
 	char *cp = NULL;
@@ -317,7 +316,7 @@ build_form(char *form, char *digest, int volume, int issue)
 		cptr->c_text = digest;
 	FINDCOMP(cptr, "date");
 	if (cptr)
-		cptr->c_text = getcpy(dtimenow());
+		cptr->c_text = mh_xstrdup(dtimenow());
 
 	dat[0] = issue;
 	dat[1] = volume;
@@ -334,10 +333,10 @@ build_form(char *form, char *digest, int volume, int issue)
 	if ((in = dup(fileno(tmp))) == NOTOK)
 		adios(EX_OSERR, "dup", "unable to");
 
-	line = mh_xmalloc((unsigned) fmtsize);
+	line = mh_xcalloc(fmtsize, sizeof(char));
 	fmt_scan(fmt, line, fmtsize, dat);
 	fputs(line, tmp);
-	free(line);
+	mh_free0(&line);
 	if (fclose(tmp))
 		adios(EX_IOERR, tmpfil, "error writing");