X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fslocal.c;h=df0dc7f6524066892a0509ed1dd5228be5e06d44;hp=17a1d365b8f0b6dd47654c781228eef044f503ad;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=d4c34b4439a9dbd89664de460ed37ecddc260fb1

diff --git a/uip/slocal.c b/uip/slocal.c
index 17a1d36..df0dc7f 100644
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -72,6 +72,7 @@ static struct swit switches[] = {
 	{ NULL, 0 }
 };
 
+char *version=VERSION;
 
 static int globbed = 0;  /* have we built "vars" table yet? */
 static int parsed = 0;  /* have we built header field table yet */
@@ -724,10 +725,10 @@ split(char *cp, char **vec)
 static int
 parse(int fd)
 {
-	int i, state;
-	int fd1;
+	enum state state;
+	struct field f = {{0}};
+	int i, fd1;
 	char *cp, *dp, *lp;
-	char name[NAMESZ], field[BUFSIZ];
 	struct pair *p, *q;
 	FILE  *in;
 
@@ -747,28 +748,25 @@ 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);
 	}
 
 	/*
 	** Scan the headers of the message and build a lookup table.
 	*/
-	for (i = 0, state = FLD;;) {
-		switch (state = m_getfld(state, name, field, sizeof(field),
-				in)) {
-		case FLD:
-		case FLDPLUS:
-			lp = getcpy(field);
-			while (state == FLDPLUS) {
-				state = m_getfld(state, name, field,
-						sizeof(field), in);
-				lp = add(field, lp);
-			}
+	for (i = 0, state = FLD2;;) {
+		switch (state = m_getfld2(state, &f, in)) {
+		case LENERR2:
+			state = FLD2;
+			/* FALL */
+
+		case FLD2:
+			lp = mh_xstrdup(f.value);
 			for (p = hdrs; p->p_name; p++) {
-				if (mh_strcasecmp(p->p_name, 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) {
@@ -788,7 +786,7 @@ parse(int fd)
 				}
 			}
 			if (!p->p_name && i < NVEC) {
-				p->p_name = getcpy(name);
+				p->p_name = mh_xstrdup(f.name);
 				p->p_value = lp;
 				p->p_flags = P_NIL;
 				p++, i++;
@@ -796,12 +794,12 @@ parse(int fd)
 			}
 			continue;
 
-		case BODY:
-		case FILEEOF:
+		case BODY2:
+		case FILEEOF2:
 			break;
 
-		case LENERR:
-		case FMTERR:
+		case FMTERR2:
+		case IOERR2:
 			advise(NULL, "format error in message");
 			break;
 
@@ -818,7 +816,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",
@@ -891,18 +889,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++) {
@@ -1090,7 +1088,7 @@ get_sender(char *envelope, char **sender)
 	unsigned char buffer[BUFSIZ];
 
 	if (!envelope) {
-		*sender = getcpy("");
+		*sender = mh_xstrdup("");
 		return;
 	}
 
@@ -1114,7 +1112,7 @@ get_sender(char *envelope, char **sender)
 		} else {
 			break;
 		}
-	*sender = getcpy(buffer);
+	*sender = mh_xstrdup(buffer);
 }
 
 
@@ -1194,7 +1192,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);
@@ -1264,7 +1262,7 @@ trimstr(char *cp)
 			*sp = ' ';
 		}
 	}
-	return getcpy(bp);
+	return mh_xstrdup(bp);
 }
 
 /*