X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fspost.c;h=b8ae562984c347eaf98b85af944d6e89ca1da7a9;hp=96ca14d1cd0887750ceed0f7b18a58be707a89ba;hb=a87df3543d3bc128ba4079d1f95638476ba5ca50;hpb=ec019f1e02bfc457c156a81bd6cc879e89644c21

diff --git a/uip/spost.c b/uip/spost.c
index 96ca14d..b8ae562 100644
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -76,7 +76,7 @@ static struct headers NHeaders[] = {
 	{ "Subject", HSUB, 0 },
 	{ "To", HADR|HTRY, MVIS },
 	{ "Cc", HADR|HTRY, MVIS },
-	{ "Dcc", HADR|HTRY|HDCC, MVIS },
+	{ "Dcc", HADR|HTRY|HDCC, MINV },
 	{ "Bcc", HADR|HTRY|HBCC, MINV },
 	{ "Message-Id", HBAD, 0 },
 	{ "Fcc", HFCC, 0 },
@@ -92,7 +92,7 @@ static struct headers RHeaders[] = {
 	{ "Resent-Subject", HSUB, 0 },
 	{ "Resent-To", HADR|HTRY, MVIS },
 	{ "Resent-Cc", HADR|HTRY, MVIS },
-	{ "Resent-Dcc", HADR|HTRY|HDCC, MVIS },
+	{ "Resent-Dcc", HADR|HTRY|HDCC, MINV },
 	{ "Resent-Bcc", HADR|HTRY|HBCC, MINV },
 	{ "Resent-Message-Id", HBAD, 0 },
 	{ "Resent-Fcc", HFCC, 0 },
@@ -143,9 +143,11 @@ static size_t do_aliasing(struct mailname *, struct mailname **);
 int
 main(int argc, char **argv)
 {
-	int state, compnum;
+	enum state state;
+	struct field f = free_field;
+	int compnum;
 	char *cp, *msg = NULL, **argp, **arguments;
-	char **sargv, buf[BUFSIZ], name[NAMESZ];
+	char **sargv, buf[BUFSIZ];
 	FILE *in;
 
 	setlocale(LC_ALL, "");
@@ -230,37 +232,28 @@ main(int argc, char **argv)
 
 	hdrtab = (msgstate == normal) ? NHeaders : RHeaders;
 
-	for (compnum = 1, state = FLD;;) {
-		switch (state = m_getfld(state, name, buf, sizeof(buf), in)) {
-		case FLD:
-		case FLDPLUS:
+	for (compnum = 1, state = FLD2;;) {
+		switch (state = m_getfld2(state, &f, in)) {
+		case FLD2:
 			compnum++;
-			cp = getcpy(buf);
-			while (state == FLDPLUS) {
-				state = m_getfld(state, name, buf,
-						sizeof(buf), in);
-				cp = add(buf, cp);
-			}
-			putfmt(name, cp, out);
-			free(cp);
+			putfmt(f.name, f.value, out);
 			continue;
 
-		case BODY:
+		case BODY2:
 			finish_headers(out);
-			fprintf(out, "\n%s", buf);
-			while (state == BODY) {
-				state = m_getfld(state, name, buf,
-						sizeof(buf), in);
-				fputs(buf, out);
+			fprintf(out, "\n%s", f.value);
+			while ((state = m_getfld2(state, &f, in)) == BODY2) {
+				fputs(f.value, out);
 			}
 			break;
 
-		case FILEEOF:
+		case FILEEOF2:
 			finish_headers(out);
 			break;
 
-		case LENERR:
-		case FMTERR:
+		case LENERR2:
+		case FMTERR2:
+		case IOERR2:
 			adios(EX_DATAERR, NULL, "message format error in component #%d",
 					compnum);
 
@@ -357,7 +350,8 @@ putfmt(char *name, char *str, FILE *out)
 	int i;
 	struct headers *hdr;
 	struct mailname addr_start, *addr_end;
-	size_t addrc;
+	size_t addrc = 0;
+	ssize_t ret;
 
 	addr_end = &addr_start;
 	addr_end->m_next = NULL;
@@ -411,7 +405,11 @@ putfmt(char *name, char *str, FILE *out)
 		return;
 	}
 
-	addrc = getmboxes(str, &addr_end);
+	if ((ret = getmboxes(str, &addr_end)) < 0) {
+		adios(EX_DATAERR, NULL, "can't parse address: %s", str);
+	}
+
+	addrc += ret;
 
 	if (aliasflg) {
 		addrc += do_aliasing(&addr_start, &addr_end);
@@ -426,7 +424,6 @@ putfmt(char *name, char *str, FILE *out)
 	if (hdr->set & MFRM) {
 		struct mailname *mp = NULL;
 		struct mailname *my = NULL;
-		unsigned int fromcnt = 0;
 
 		/* needed because the address parser holds global state */
 		ismymbox(NULL);
@@ -438,10 +435,9 @@ putfmt(char *name, char *str, FILE *out)
 					my = mp;
 				}
 			}
-			fromcnt++;
 		}
 
-		if (fromcnt > 1) {
+		if (addrc > 1) {
 			sender = my;
 		}
 	}
@@ -531,7 +527,8 @@ get_header(char *header, struct headers *table)
 static void
 putadr(char *name, struct mailname *nl)
 {
-	struct mailname *mp, *mp2;
+	struct mailname *mp;
+	char *cp;
 	int linepos;
 	int namelen;
 
@@ -544,8 +541,17 @@ putadr(char *name, struct mailname *nl)
 			fprintf(out, "\n%s: ", name);
 			linepos = namelen;
 		}
-		linepos = putone(mp->m_text, linepos, namelen);
-		mp2 = mp;
+		if (mp->m_ingrp) {
+			if (mp->m_gname != NULL) {
+				cp = getcpy(mp->m_gname);
+				cp = add(";", cp);
+				linepos = putone(cp, linepos, namelen);
+				free(cp);
+				cp = NULL;
+			}
+		} else {
+			linepos = putone(mp->m_text, linepos, namelen);
+		}
 		mp = mp->m_next;
 	}
 	putc('\n', out);
@@ -681,6 +687,7 @@ do_aliasing(struct mailname *start, struct mailname **end)
 	struct mailname *prev, *cur;
 	char *cp;
 	size_t i = 0;
+	ssize_t e;
 
 	prev = start;
 	cur = prev->m_next;
@@ -690,7 +697,10 @@ do_aliasing(struct mailname *start, struct mailname **end)
 			cp = akvalue(cur->m_mbox);
 			if (strcmp(cp, cur->m_mbox) != 0) {
 				prev->m_next = cur->m_next;
-				i += getmboxes(cp, &prev);
+				if ((e = getmboxes(cp, &prev)) < 0) {
+					goto error;
+				}
+				i += e;
 				i -= 1;
 				mnfree(cur);
 			} else {
@@ -703,4 +713,7 @@ do_aliasing(struct mailname *start, struct mailname **end)
 	}
 	*end = prev;
 	return i;
+error:
+	adios(EX_CONFIG, NULL, "can't parse alias %s: %s", cur->m_mbox, cp);
+	return 0; /* not reached */
 }