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

diff --git a/uip/spost.c b/uip/spost.c
index 780b5f4..b8ae562 100644
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -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);
 
@@ -535,6 +528,7 @@ static void
 putadr(char *name, struct mailname *nl)
 {
 	struct mailname *mp;
+	char *cp;
 	int linepos;
 	int namelen;
 
@@ -547,7 +541,17 @@ putadr(char *name, struct mailname *nl)
 			fprintf(out, "\n%s: ", name);
 			linepos = namelen;
 		}
-		linepos = putone(mp->m_text, linepos, namelen);
+		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);