X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fscansbr.c;h=7dedf70574f5027a2fa1722107842bf91e63fb50;hb=d7b4f0034bc4f5b5c2f990d0984858e9b6f4131a;hp=dca761c4f2c7f53e93329d3baeaa92080d79235c;hpb=b8b075c77be7794f3ae9ff0e8cedb12b48fd139f;p=mmh

diff --git a/uip/scansbr.c b/uip/scansbr.c
index dca761c..7dedf70 100644
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -30,16 +30,13 @@
 /*
 ** 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 only going to display 30
-** characters of it.
+** calls on m_getfld.
 */
 #define SBUFSIZ 512
 
 static struct format *fmt;
 
 static struct comp *datecomp;  /* pntr to "date" comp */
-static struct comp *bodycomp;  /* pntr to "body" pseudo-comp (if referenced) */
 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 */
@@ -49,7 +46,7 @@ static int dat[5];  /* aux. data for format routine */
 char *scanl = NULL;  /* text of most recent scanline */
 
 #define FPUTS(buf) {\
-		if (fputs(buf,scnout) == EOF)\
+		if (fputs(buf, scnout) == EOF)\
 			adios(scnmsg, "write error on");\
 	}
 
@@ -68,20 +65,20 @@ int
 scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg,
 	int unseen)
 {
+	static int slwidth;
 	int i, compnum, state;
 	unsigned char *cp, *tmpbuf;
 	char **nxtbuf;
-	char *saved_c_text = NULL;
 	struct comp *cptr;
 	struct comp **savecomp;
 	char *scnmsg = NULL;
 	FILE *scnout = NULL;
 	char name[NAMESZ];
-	static int rlwidth, slwidth;
 	char returnpath[BUFSIZ];
 	char deliverydate[BUFSIZ];
 	int incing = (outnum > 0);
-	int ismbox = (outnum != 0);
+	int scanfolder = (outnum == 0);
+	long fpos;
 
 	/* first-time only initialization */
 	if (!scanl) {
@@ -93,27 +90,28 @@ scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg,
 		}
 		dat[3] = slwidth = width;
 		scanl = (char *) mh_xmalloc((size_t) SCAN_CHARWIDTH *
-				(slwidth + 2) );
+				(slwidth + 2));  /* probably for \n and \0 */
 		if (incing)
 			umask(~m_gmprot());
 
 		/* Compile format string */
 		ncomps = fmt_compile(fmtstr, &fmt) + 1;
 
-		FINDCOMP(bodycomp, "body");
 		FINDCOMP(datecomp, "date");
 		nxtbuf = compbuffers = (char **) calloc((size_t) ncomps,
 				sizeof(char *));
-		if (nxtbuf == NULL)
+		if (!nxtbuf)
 			adios(NULL, "unable to allocate component buffers");
 		used_buf = (struct comp **) calloc((size_t) (ncomps+1),
-			sizeof(struct comp *));
-		if (used_buf == NULL)
+				sizeof(struct comp *));
+		if (!used_buf)
 			adios(NULL, "unable to allocate component buffer stack");
-		used_buf += ncomps+1; *--used_buf = 0;
-		rlwidth = bodycomp && (width > SBUFSIZ) ? width : SBUFSIZ;
+		/* NULL-terminate array */
+		used_buf += ncomps;
+		*used_buf = NULL;
+		/* allocate space for the items */
 		for (i = ncomps; i--; )
-			*nxtbuf++ = mh_xmalloc(rlwidth);
+			*nxtbuf++ = mh_xmalloc(SBUFSIZ);
 	}
 
 	/*
@@ -125,12 +123,13 @@ scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg,
 	dat[0] = innum ? innum : outnum;
 	dat[1] = curflg;
 	dat[4] = unseen;
+	fpos = ftell(inb);
 
 	/*
 	** Get the first field.  If the message is non-empty
 	** and we're doing an "inc", open the output file.
 	*/
-	if ((state = m_getfld(FLD, name, tmpbuf, rlwidth, inb)) == FILEEOF) {
+	if ((state = m_getfld(FLD, name, tmpbuf, SBUFSIZ, inb)) == FILEEOF) {
 		if (ferror(inb)) {
 			advise("read", "unable to"); /* "read error" */
 			return SCNFAT;
@@ -139,15 +138,11 @@ scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg,
 		}
 	}
 
-	if (ismbox) {
-		if (incing) {
-			scnmsg = m_name(outnum);
-			if (*scnmsg == '?')  /* msg num out of range */
-				return SCNNUM;
-		} else {
-			scnmsg = "/dev/null";
-		}
-		if ((scnout = fopen(scnmsg, "w")) == NULL)
+	if (incing) {
+		scnmsg = m_name(outnum);
+		if (*scnmsg == '?')  /* msg num out of range */
+			return SCNNUM;
+		if (!(scnout = fopen(scnmsg, "w")))
 			adios(scnmsg, "unable to write");
 		/*
 		** Add the Return-Path and Delivery-Date
@@ -164,15 +159,14 @@ scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg,
 
 	/* scan - main loop */
 	for (compnum = 1; ;
-			state = m_getfld(state, name, tmpbuf, rlwidth, inb)) {
+			state = m_getfld(state, name, tmpbuf, SBUFSIZ, inb)) {
 		switch (state) {
 		case FLD:
 		case FLDPLUS:
 			compnum++;
 			if (incing) {
 				FPUTS(name);
-				if (putc(':', scnout) == EOF)
-					adios(scnmsg, "write error on");
+				FPUTS(":");
 				FPUTS(tmpbuf);
 			}
 			/*
@@ -201,7 +195,7 @@ scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg,
 			}
 
 			while (state == FLDPLUS) {
-				state = m_getfld(state, name, tmpbuf, rlwidth,
+				state = m_getfld(state, name, tmpbuf, SBUFSIZ,
 						inb);
 				if (incing)
 					FPUTS(tmpbuf);
@@ -211,47 +205,25 @@ scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg,
 		case BODY:
 			compnum = -1;
 			if (!incing) {
-				state = FILEEOF; /* stop now if scan cmd */
+				/* stop here if scan cmd */
+				if (scanfolder) {
+					state = FILEEOF;
+					goto finished;
+				}
+				/* for mboxes: snarf the body */
+				while (state == BODY) {
+					state = m_getfld(state, name, tmpbuf,
+							SBUFSIZ, inb);
+				}
 				goto finished;
 			}
-			if (putc('\n', scnout) == EOF)
-				adios(scnmsg, "write error on");
+			FPUTS("\n");
 			FPUTS(tmpbuf);
-			/*
-			** performance hack: some people like to run "inc"
-			** on things like net.sources or large digests.
-			** We do a copy directly into the output buffer
-			** rather than going through an intermediate buffer.
-			**
-			** We need the amount of data m_getfld found &
-			** don't want to do a strlen on the long buffer so
-			** there's a hack in m_getfld to save the amount
-			** of data it returned in the global "msg_count".
-			*/
 body:;
 			while (state == BODY) {
-#ifdef LINUX_STDIO
-				if (scnout->_IO_write_ptr == scnout->_IO_write_end) {
-#elif defined(__DragonFly__)
-				if (((struct __FILE_public *)scnout)->_w <= 0) {
-#else
-				if (scnout->_cnt <= 0) {
-#endif
-					if (fflush(scnout) == EOF)
-						adios(scnmsg, "write error on");
-				}
-#ifdef LINUX_STDIO
-				state = m_getfld(state, name, scnout->_IO_write_ptr, (long)scnout->_IO_write_ptr-(long)scnout->_IO_write_end , inb);
-				scnout->_IO_write_ptr += msg_count;
-#elif defined(__DragonFly__)
-				state = m_getfld(state, name, ((struct __FILE_public *)scnout)->_p, -(((struct __FILE_public *)scnout)->_w), inb);
-				((struct __FILE_public *)scnout)->_w -= msg_count;
-				((struct __FILE_public *)scnout)->_p += msg_count;
-#else
-				state = m_getfld(state, name, scnout->_ptr, -(scnout->_cnt), inb);
-				scnout->_cnt -= msg_count;
-				scnout->_ptr += msg_count;
-#endif
+				state = m_getfld(state, name, tmpbuf, SBUFSIZ,
+						inb);
+				FPUTS(tmpbuf);
 			}
 			goto finished;
 
@@ -263,14 +235,11 @@ body:;
 			if (incing) {
 				FPUTS("\n\nBAD MSG:\n");
 				FPUTS(name);
-				if (putc('\n', scnout) == EOF)
-					adios(scnmsg, "write error on");
-			}
-			if (ismbox) {
+				FPUTS("\n");
 				state = BODY;
 				goto body;
 			}
-			/* fall through */
+			/* fall through if we scan only */
 
 		case FILEEOF:
 			goto finished;
@@ -288,28 +257,26 @@ finished:
 		return SCNFAT;
 	}
 
-	/* Save and restore buffer so we don't trash our dynamic pool! */
-	if (bodycomp) {
-		saved_c_text = bodycomp->c_text;
-		bodycomp->c_text = tmpbuf;
-	}
-
 	if (incing) {
 		if ((dat[2] = ftell(scnout)) == EOF)
 			adios(scnmsg, "write error on");
+	} else if (!scanfolder) {
+		if ((dat[2] = ftell(inb)) == EOF)
+			adios(scnmsg, "write error on");
+		dat[2] -= fpos;
 	}
 
-	if ((datecomp && !datecomp->c_text) || !ismbox) {
+	if ((datecomp && !datecomp->c_text) || scanfolder) {
 		struct stat st;
 
 		fstat(fileno(inb), &st);
-		if (!ismbox)
+		if (scanfolder)
 			dat[2] = st.st_size;
 		if (datecomp) {
-			if (! datecomp->c_text) {
-				if (datecomp->c_tws == NULL)
+			if (!datecomp->c_text) {
+				if (!datecomp->c_tws)
 					datecomp->c_tws = (struct tws *) calloc((size_t) 1, sizeof(*datecomp->c_tws));
-				if (datecomp->c_tws == NULL)
+				if (!datecomp->c_tws)
 					adios(NULL, "unable to allocate tws buffer");
 				*datecomp->c_tws = *dlocaltime((time_t *) &st.st_mtime);
 				datecomp->c_flags |= CF_DATEFAB|CF_TRUE;
@@ -324,9 +291,6 @@ finished:
 	if (fmtstr)
 		fputs(scanl, stdout);
 
-	if (bodycomp)
-		bodycomp->c_text = saved_c_text;
-
 	/* return dynamically allocated buffers to pool */
 	while ((cptr = *savecomp++)) {
 		*--nxtbuf = cptr->c_text;
@@ -334,7 +298,7 @@ finished:
 	}
 	*--nxtbuf = tmpbuf;
 
-	if (ismbox && (ferror(scnout) || fclose(scnout) == EOF))
+	if (incing && (ferror(scnout) || fclose(scnout) == EOF))
 		adios(scnmsg, "write error on");
 
 	return (state != FILEEOF ? SCNERR : SCNMSG);