X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frepl.c;h=bbc3cfe83be6a59f3d93ac5dc08ed2eddcc8fab7;hp=0ff86b817070ead900bd2104da935a2e1c48a0c8;hb=a87df3543d3bc128ba4079d1f95638476ba5ca50;hpb=cf1205b5cbea2f0cd6ea710ec16c637df85b647c

diff --git a/uip/repl.c b/uip/repl.c
index 0ff86b8..bbc3cfe 100644
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -72,15 +72,6 @@ static struct swit ccswitches[] = {
 	{ NULL, 0 }
 };
 
-/*
-** Buffer size for content part of header fields.
-** We want this to be large enough so that we don't
-** do a lot of extra FLDPLUS calls on m_getfld but
-** small enough so that we don't snarf the entire
-** message body when we're not going to use any of it.
-*/
-#define SBUFSIZ 256
-
 static short ccto = -1;
 static short cccc = -1;
 static short ccme = -1;
@@ -102,8 +93,6 @@ static struct mailname mq;
 static struct format *fmt;
 
 static int ncomps = 0;  /* # of interesting components */
-static char **compbuffers = NULL;  /* buffers for component text */
-static struct comp **used_buf = NULL;  /* stack for comp that use buffers */
 
 static int dat[5];  /* aux. data for format routine */
 
@@ -388,14 +377,13 @@ static void
 replout(FILE *inb, char *drft, struct msgs *mp,
 	int mime, char *form, char *filter)
 {
-	register int state, i;
-	register struct comp *cptr;
-	register char *tmpbuf;
-	register char **nxtbuf;
-	register char **ap;
-	register struct comp **savecomp;
+	enum state state;
+	struct field f = free_field;
+	int i;
+	struct comp *cptr;
+	char **ap;
 	int char_read = 0, format_len, mask;
-	char name[NAMESZ], *scanl;
+	char *scanl;
 	unsigned char *cp;
 	FILE *out;
 
@@ -412,21 +400,6 @@ replout(FILE *inb, char *drft, struct msgs *mp,
 	/* compile format string */
 	ncomps = fmt_compile(cp, &fmt) + 1;
 
-	if (!(nxtbuf = compbuffers = (char **)
-			calloc((size_t) ncomps, sizeof(char *))))
-		adios(EX_OSERR, NULL, "unable to allocate component buffers");
-	if (!(savecomp = used_buf = (struct comp **)
-			calloc((size_t) (ncomps+1), sizeof(struct comp *))))
-		adios(EX_OSERR, NULL, "unable to allocate component buffer stack");
-	savecomp += ncomps + 1;
-	*--savecomp = NULL;  /* point at zero'd end minus 1 */
-
-	for (i = ncomps; i--; )
-		*nxtbuf++ = mh_xmalloc(SBUFSIZ);
-
-	nxtbuf = compbuffers;  /* point at start */
-	tmpbuf = *nxtbuf++;
-
 	for (ap = addrcomps; *ap; ap++) {
 		FINDCOMP(cptr, *ap);
 		if (cptr)
@@ -457,11 +430,10 @@ replout(FILE *inb, char *drft, struct msgs *mp,
 	/*
 	** pick any interesting stuff out of msg "inb"
 	*/
-	for (state = FLD;;) {
-		state = m_getfld(state, name, tmpbuf, SBUFSIZ, inb);
+	for (state = FLD2;;) {
+		state = m_getfld2(state, &f, inb);
 		switch (state) {
-		case FLD:
-		case FLDPLUS:
+		case FLD2:
 			/*
 			** if we're interested in this component, save
 			** a pointer to the component text, then start
@@ -469,47 +441,41 @@ replout(FILE *inb, char *drft, struct msgs *mp,
 			** temp buffer (buffer switching saves an extra
 			** copy of the component text).
 			*/
-			if ((cptr = wantcomp[CHASH(name)]))
+			if ((cptr = wantcomp[CHASH(f.name)])) {
 				do {
-					if (!mh_strcasecmp(name, cptr->c_name)) {
-						char_read += msg_count;
-						if (! cptr->c_text) {
-							i = strlen(cptr->c_text = tmpbuf) - 1;
-							if (tmpbuf[i] == '\n')
-								tmpbuf[i] = '\0';
-							*--savecomp = cptr;
-							tmpbuf = *nxtbuf++;
-						} else {
-							i = strlen(cp = cptr->c_text) - 1;
-							if (cp[i] == '\n') {
-								if (cptr->c_type & CT_ADDR) {
-									cp[i] = '\0';
-									cp = add(",\n\t", cp);
-								} else {
-									cp = add("\t", cp);
-								}
-							}
-							cptr->c_text = add(tmpbuf, cp);
+					if (mh_strcasecmp(f.name, cptr->c_name)!=0) {
+						continue;
+					}
+					char_read += strlen(f.value);
+					if (!cptr->c_text) {
+						cptr->c_text = getcpy(f.value);
+						i = strlen(cptr->c_text) - 1;
+						if (cptr->c_text[i] == '\n') {
+							cptr->c_text[i] = '\0';
 						}
-						while (state == FLDPLUS) {
-							state = m_getfld(state, name, tmpbuf,
-											  SBUFSIZ, inb);
-							cptr->c_text = add(tmpbuf, cptr->c_text);
-							char_read += msg_count;
+					} else {
+						cp = cptr->c_text;
+						i = strlen(cp) - 1;
+						if (cp[i] == '\n') {
+							if (cptr->c_type & CT_ADDR) {
+								cp[i] = '\0';
+								cp = add(",\n\t", cp);
+							} else {
+								cp = add("\t", cp);
+							}
 						}
-						break;
+						cptr->c_text = add(f.value, cp);
 					}
+					break;
 				} while ((cptr = cptr->c_next));
-
-			while (state == FLDPLUS)
-				state = m_getfld(state, name, tmpbuf,
-						SBUFSIZ, inb);
+			}
 			break;
 
-		case LENERR:
-		case FMTERR:
-		case BODY:
-		case FILEEOF:
+		case LENERR2:
+		case FMTERR2:
+		case IOERR2:
+		case BODY2:
+		case FILEEOF2:
 			goto finished;
 
 		default:
@@ -527,7 +493,7 @@ finished:
 	*/
 	FINDCOMP(cptr, "subject")
 	if (cptr && (cp = cptr->c_text)) {
-		register char *sp = cp;
+		char *sp = cp;
 
 		for (;;) {
 			while (isspace(*cp))
@@ -587,13 +553,6 @@ finished:
 
 	/* return dynamically allocated buffers */
 	free(scanl);
-	for (nxtbuf = compbuffers, i = ncomps; (cptr = *savecomp++);
-			nxtbuf++, i--)
-		free(cptr->c_text);  /* if not nxtbuf, nxtbuf already freed */
-	while ( i-- > 0)
-		free(*nxtbuf++);  /* free unused nxtbufs */
-	free((char *) compbuffers);
-	free((char *) used_buf);
 }
 
 static char *buf;  /* our current working buffer */
@@ -638,13 +597,13 @@ static unsigned int bufsiz=0;  /* current size of buf */
 char *
 formataddr(char *orig, char *str)
 {
-	register int len;
+	int len;
 	char baddr[BUFSIZ], error[BUFSIZ];
-	register int isgroup;
-	register char *dst;
-	register char *cp;
-	register char *sp;
-	register struct mailname *mp = NULL;
+	int isgroup;
+	char *dst;
+	char *cp;
+	char *sp;
+	struct mailname *mp = NULL;
 
 	/* if we don't have a buffer yet, get one */
 	if (bufsiz == 0) {
@@ -710,7 +669,7 @@ static int
 insert(struct mailname *np)
 {
 	char buffer[BUFSIZ];
-	register struct mailname *mp;
+	struct mailname *mp;
 
 	if (np->m_mbox == NULL)
 		return 0;