X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fslocal.c;h=9306f94b0fdeee6f1288ba9e3dcc9d1d21ea3806;hp=5760a83db3d78bc6228af2d12c57a0fdc471f196;hb=88b2142594d5ea1e8385dae5eca81eed1018c555;hpb=1e99819ed105950cd584c71fa4b2e36b038be102

diff --git a/uip/slocal.c b/uip/slocal.c
index 5760a83..9306f94 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);
 	}
 
 	/*
@@ -758,10 +758,14 @@ parse(int fd)
 	*/
 	for (i = 0, state = FLD2;;) {
 		switch (state = m_getfld2(state, &f, in)) {
+		case LENERR2:
+			state = FLD2;
+			/* FALL */
+
 		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 (mh_strcasecmp(p->p_name, f.name) == 0) {
 					if (!(p->p_flags & P_HID)) {
 						if ((cp = p->p_value)) {
 							if (p->p_flags & P_ADR) {
@@ -776,12 +780,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++;
@@ -793,9 +797,8 @@ parse(int fd)
 		case FILEEOF2:
 			break;
 
-		case LENERR2:
 		case FMTERR2:
-		case ERR2:
+		case IOERR2:
 			advise(NULL, "format error in message");
 			break;
 
@@ -812,7 +815,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 +888,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 +1087,7 @@ get_sender(char *envelope, char **sender)
 	unsigned char buffer[BUFSIZ];
 
 	if (!envelope) {
-		*sender = getcpy("");
+		*sender = mh_xstrdup("");
 		return;
 	}
 
@@ -1108,7 +1111,7 @@ get_sender(char *envelope, char **sender)
 		} else {
 			break;
 		}
-	*sender = getcpy(buffer);
+	*sender = mh_xstrdup(buffer);
 }
 
 
@@ -1188,7 +1191,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 +1261,7 @@ trimstr(char *cp)
 			*sp = ' ';
 		}
 	}
-	return getcpy(bp);
+	return mh_xstrdup(bp);
 }
 
 /*