X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fslocal.c;h=18c4a5820accd038be8b78e1e1aef487863be509;hp=eac77e4973d505e9621ef8b2ca2528fcdb6219a9;hb=9cf6132a6ea29968131a000bc2fb6860affac45e;hpb=cf1205b5cbea2f0cd6ea710ec16c637df85b647c

diff --git a/uip/slocal.c b/uip/slocal.c
index eac77e4..18c4a58 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);
 	}
 
 	/*
@@ -760,9 +760,8 @@ parse(int fd)
 		switch (state = m_getfld(state, name, field, sizeof(field),
 				in)) {
 		case FLD:
-		case FLDEOF:
 		case FLDPLUS:
-			lp = getcpy(field);
+			lp = mh_xstrdup(field);
 			while (state == FLDPLUS) {
 				state = m_getfld(state, name, field,
 						sizeof(field), in);
@@ -784,24 +783,20 @@ 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(name);
+				p->p_name = mh_xstrdup(name);
 				p->p_value = lp;
 				p->p_flags = P_NIL;
 				p++, i++;
 				p->p_name = NULL;
 			}
-			if (state != FLDEOF) {
-				continue;
-			}
-			break;
+			continue;
 
 		case BODY:
-		case BODYEOF:
 		case FILEEOF:
 			break;
 
@@ -823,7 +818,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",
@@ -896,18 +891,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++) {
@@ -1095,7 +1090,7 @@ get_sender(char *envelope, char **sender)
 	unsigned char buffer[BUFSIZ];
 
 	if (!envelope) {
-		*sender = getcpy("");
+		*sender = mh_xstrdup("");
 		return;
 	}
 
@@ -1119,7 +1114,7 @@ get_sender(char *envelope, char **sender)
 		} else {
 			break;
 		}
-	*sender = getcpy(buffer);
+	*sender = mh_xstrdup(buffer);
 }
 
 
@@ -1199,7 +1194,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);
@@ -1269,7 +1264,7 @@ trimstr(char *cp)
 			*sp = ' ';
 		}
 	}
-	return getcpy(bp);
+	return mh_xstrdup(bp);
 }
 
 /*