X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fslocal.c;fp=uip%2Fslocal.c;h=f8f9d9537931be93650a662e70d8cfff4b4e4423;hp=c3b45e87aaf8b3b7b8a068fa2a675bb28ebf4b00;hb=04a3dfc70394a517a79340a7d3ecd9c6a23d0bee;hpb=4cc601f996579386ce4f4937b9b72b7b3d891107

diff --git a/uip/slocal.c b/uip/slocal.c
index c3b45e8..f8f9d95 100644
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -747,10 +747,10 @@ parse(int fd)
 
 	/* add special entries to lookup table */
 	if ((p = lookup(hdrs, "source"))) {
-		p->p_value = getcpy(sender);
+		p->p_value = mh_xstrdup(sender);
 	}
 	if ((p = lookup(hdrs, "addr"))) {
-		p->p_value = getcpy(addr);
+		p->p_value = mh_xstrdup(addr);
 	}
 
 	/*
@@ -759,7 +759,7 @@ parse(int fd)
 	for (i = 0, state = FLD2;;) {
 		switch (state = m_getfld2(state, &f, in)) {
 		case FLD2:
-			lp = getcpy(f.value);
+			lp = mh_xstrdup(f.value);
 			for (p = hdrs; p->p_name; p++) {
 				if (mh_strcasecmp(p->p_name, f.name)!=0) {
 					if (!(p->p_flags & P_HID)) {
@@ -776,12 +776,12 @@ parse(int fd)
 						}
 						p->p_value = add(lp, cp);
 					}
-					free(lp);
+					mh_free0(&lp);
 					break;
 				}
 			}
 			if (!p->p_name && i < NVEC) {
-				p->p_name = getcpy(f.name);
+				p->p_name = mh_xstrdup(f.name);
 				p->p_value = lp;
 				p->p_flags = P_NIL;
 				p++, i++;
@@ -812,7 +812,7 @@ parse(int fd)
 		if (!(q = lookup(hdrs, "reply-to")) || !q->p_value) {
 			q = lookup(hdrs, "from");
 		}
-		p->p_value = getcpy(q ? q->p_value : "");
+		p->p_value = mh_xstrdup(q ? q->p_value : "");
 		p->p_flags &= ~P_CHK;
 		if (debug) {
 			debug_printf("vars[%d]: name=\"%s\" value=\"%s\"\n",
@@ -885,18 +885,18 @@ glob(int fd)
 		return;
 	}
 	if ((p = lookup(vars, "sender"))) {
-		p->p_value = getcpy(sender);
+		p->p_value = mh_xstrdup(sender);
 	}
 	if ((p = lookup(vars, "address"))) {
-		p->p_value = getcpy(addr);
+		p->p_value = mh_xstrdup(addr);
 	}
 	if ((p = lookup(vars, "size"))) {
 		snprintf(buffer, sizeof(buffer), "%d",
 				fstat(fd, &st) != -1 ? (int) st.st_size : 0);
-		p->p_value = getcpy(buffer);
+		p->p_value = mh_xstrdup(buffer);
 	}
 	if ((p = lookup(vars, "info"))) {
-		p->p_value = getcpy(info);
+		p->p_value = mh_xstrdup(info);
 	}
 	if (debug) {
 		for (p = vars; p->p_name; p++) {
@@ -1084,7 +1084,7 @@ get_sender(char *envelope, char **sender)
 	unsigned char buffer[BUFSIZ];
 
 	if (!envelope) {
-		*sender = getcpy("");
+		*sender = mh_xstrdup("");
 		return;
 	}
 
@@ -1108,7 +1108,7 @@ get_sender(char *envelope, char **sender)
 		} else {
 			break;
 		}
-	*sender = getcpy(buffer);
+	*sender = mh_xstrdup(buffer);
 }
 
 
@@ -1188,7 +1188,7 @@ you_lose:
 				** get copy of envelope information
 				** ("From " line)
 				*/
-				envelope = getcpy(buffer);
+				envelope = mh_xstrdup(buffer);
 
 				/* Put the delivery date in message */
 				fputs(ddate, ffp);
@@ -1258,7 +1258,7 @@ trimstr(char *cp)
 			*sp = ' ';
 		}
 	}
-	return getcpy(bp);
+	return mh_xstrdup(bp);
 }
 
 /*