X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fscansbr.c;h=8281c7bc0d49fe7df2bf3c5d653521d7eccc88b5;hp=7c0d1985b56fb85d96e807e1454f00da1c503d0f;hb=a87df3543d3bc128ba4079d1f95638476ba5ca50;hpb=a485ed478abbd599d8c9aab48934e7a26733ecb1

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 7c0d198..8281c7b 100644
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -1,10 +1,10 @@
 /*
- * scansbr.c -- routines to help scan along...
- *
- * This code is Copyright (c) 2002, by the authors of nmh.  See the
- * COPYRIGHT file in the root directory of the nmh distribution for
- * complete copyright information.
- */
+** scansbr.c -- routines to help scan along...
+**
+** This code is Copyright (c) 2002, by the authors of nmh.  See the
+** COPYRIGHT file in the root directory of the nmh distribution for
+** complete copyright information.
+*/
 
 #include <h/mh.h>
 #include <h/addrsbr.h>
@@ -12,57 +12,30 @@
 #include <h/scansbr.h>
 #include <h/tws.h>
 #include <h/utils.h>
-
-#ifdef _FSTDIO
-# define _ptr _p  /* Gag */
-# define _cnt _w  /* Wretch */
-#endif
-
-#ifdef SCO_5_STDIO
-# define _ptr  __ptr
-# define _cnt  __cnt
-# define _base __base
-# define _filbuf(fp)  ((fp)->__cnt = 0, __filbuf(fp))
-#endif
+#include <ctype.h>
+#include <sys/stat.h>
+#include <sysexits.h>
 
 #define MAXSCANL 256  /* longest possible scan line */
 
-/*
- * 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.
- */
-#define SBUFSIZ 512
-
 static struct format *fmt;
-#ifdef JLR
-static struct format *fmt_top;
-#endif /* JLR */
 
 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 = 0;  /* buffers for component text */
-static struct comp **used_buf = 0;  /* stack for comp that use buffers */
 
 static int dat[5];  /* aux. data for format routine */
 
-char *scanl = 0;  /* text of most recent scanline */
-
-#define DIEWRERR() adios (scnmsg, "write error on")
+char *scanl = NULL;  /* text of most recent scanline */
 
 #define FPUTS(buf) {\
-		if (mh_fputs(buf,scnout) == EOF)\
-			DIEWRERR();\
+		if (fputs(buf, scnout) == EOF)\
+			adios(EX_IOERR, scnmsg, "write error on");\
 	}
 
 /*
- * prototypes
- */
-int sc_width (void);  /* from termsbr.c */
-static int mh_fputs(char *, FILE *);
+** prototypes
+*/
+int sc_width(void);  /* from termsbr.c */
 
 #ifdef MULTIBYTE_SUPPORT
 #define SCAN_CHARWIDTH MB_CUR_MAX
@@ -71,318 +44,241 @@ static int mh_fputs(char *, FILE *);
 #endif
 
 int
-scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
-	int unseen, char *folder, long size, int noisy)
+scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg,
+	int unseen)
 {
-	int i, compnum, encrypted, state;
-	unsigned char *cp, *tmpbuf;
-	char **nxtbuf;
-	char *saved_c_text = NULL;
+	static int slwidth;
+	int compnum, i;
+	enum state state;
+	struct field f = free_field;
+	char *cp;
 	struct comp *cptr;
-	struct comp **savecomp;
 	char *scnmsg = NULL;
 	FILE *scnout = NULL;
-	char name[NAMESZ];
-	static int rlwidth, slwidth;
-
-#ifdef RPATHS
-	char returnpath[BUFSIZ];
-	char deliverydate[BUFSIZ];
-#endif
+	int incing = (outnum != SCN_MBOX && outnum != SCN_FOLD);
+	int scanfolder = (outnum == SCN_FOLD);
+	long fpos;
+	struct stat st;
+	int blankline;
 
 	/* first-time only initialization */
 	if (!scanl) {
-		if (width == 0) {
-			if ((width = sc_width ()) < WIDTH/2)
-				width = WIDTH/2;
-			else if (width > MAXSCANL)
-				width = MAXSCANL;
-		}
-		dat[3] = slwidth = width;
-		scanl = (char *) mh_xmalloc((size_t) SCAN_CHARWIDTH * (slwidth + 2) );
-		if (outnum)
+		if (incing)
 			umask(~m_gmprot());
 
-		/* Compile format string */
-		ncomps = fmt_compile (nfs, &fmt) + 1;
-
-#ifdef JLR
-		fmt_top = fmt;
-#endif /* JLR */
-		FINDCOMP(bodycomp, "body");
-		FINDCOMP(datecomp, "date");
-		FINDCOMP(cptr, "folder");
-		if (cptr && folder)
-			cptr->c_text = folder;
-		FINDCOMP(cptr, "encrypted");
-		if (!cptr)
-			if ((cptr = (struct comp *) calloc (1, sizeof(*cptr)))) {
-				cptr->c_name = "encrypted";
-				cptr->c_next = wantcomp[i = CHASH (cptr->c_name)];
-				wantcomp[i] = cptr;
-				ncomps++;
+		if (fmtstr) {
+			if (width == 0) {
+				if ((width = sc_width()) < WIDTH/2)
+					width = WIDTH/2;
+				else if (width > MAXSCANL)
+					width = MAXSCANL;
+			}
+			dat[3] = slwidth = width;
+			scanl = (char *) mh_xmalloc((size_t) SCAN_CHARWIDTH *
+					(slwidth + 2));  /* probably for \n and \0 */
+			/* Compile format string */
+			ncomps = fmt_compile(fmtstr, &fmt) + 1;
+			FINDCOMP(datecomp, "date");
+		} else {
+			ncomps = 1;
+			datecomp = NULL;
 		}
-		FINDCOMP (cptr, "dtimenow");
-		if (cptr)
-			cptr->c_text = getcpy(dtimenow (0));
-		nxtbuf = compbuffers = (char **) calloc((size_t) ncomps, sizeof(char *));
-		if (nxtbuf == NULL)
-			adios (NULL, "unable to allocate component buffers");
-		used_buf = (struct comp **) calloc((size_t) (ncomps+1),
-			sizeof(struct comp *));
-		if (used_buf == NULL)
-			adios (NULL, "unable to allocate component buffer stack");
-		used_buf += ncomps+1; *--used_buf = 0;
-		rlwidth = bodycomp && (width > SBUFSIZ) ? width : SBUFSIZ;
-		for (i = ncomps; i--; )
-			*nxtbuf++ = mh_xmalloc(rlwidth);
+	}
+
+	if (feof(inb)) {
+		return SCNEOF;
 	}
 
 	/*
-	 * each-message initialization
-	 */
-	nxtbuf = compbuffers;
-	savecomp = used_buf;
-	tmpbuf = *nxtbuf++;
+	** each-message initialization
+	*/
 	dat[0] = innum ? innum : outnum;
 	dat[1] = curflg;
 	dat[4] = unseen;
-
-	/*
-	 * 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 (ferror(inb)) {
-			advise("read", "unable to"); /* "read error" */
-			return SCNFAT;
-		} else {
-			return SCNEOF;
-		}
+	fpos = ftell(inb);
+
+	if (incing) {
+		scnmsg = m_name(outnum);
+		if (*scnmsg == '?')  /* msg num out of range */
+			return SCNNUM;
+		if (!(scnout = fopen(scnmsg, "w")))
+			adios(EX_IOERR, scnmsg, "unable to write");
 	}
-
-	if (outnum) {
-		if (outnum > 0) {
-			scnmsg = m_name (outnum);
-			if (*scnmsg == '?')  /* msg num out of range */
-				return SCNNUM;
-		} else {
-			scnmsg = "/dev/null";
-		}
-		if ((scnout = fopen (scnmsg, "w")) == NULL)
-			adios (scnmsg, "unable to write");
-#ifdef RPATHS
-		/*
-		 * Add the Return-Path and Delivery-Date
-		 * header fields to message.
-		 */
-		if (get_returnpath (returnpath, sizeof(returnpath),
-				deliverydate, sizeof(deliverydate))) {
-			FPUTS ("Return-Path: ");
-			FPUTS (returnpath);
-			FPUTS ("Delivery-Date: ");
-			FPUTS (deliverydate);
-		}
-#endif /* RPATHS */
-	}
-
 	/* scan - main loop */
-	for (compnum = 1; ; state = m_getfld (state, name, tmpbuf, rlwidth, inb)) {
+	for (compnum = 1, state = FLD2; ; ) {
+		state = m_getfld2(state, &f, inb);
 		switch (state) {
-			case FLD:
-			case FLDPLUS:
-				compnum++;
-				if (outnum) {
-					FPUTS (name);
-					if ( putc (':', scnout) == EOF) DIEWRERR();
-					FPUTS (tmpbuf);
-				}
+		case FLD2:
+			compnum++;
+			if (incing) {
+				FPUTS(f.name);
+				FPUTS(":");
+				FPUTS(f.value);
+			}
+			if (fmtstr && (cptr = wantcomp[CHASH(f.name)])) {
 				/*
-				 * if we're interested in this component, save a pointer
-				 * to the component text, then start using our next free
-				 * buffer as the component temp buffer (buffer switching
-				 * saves an extra copy of the component text).
-				 */
-				if ((cptr = wantcomp[CHASH(name)])) {
-					do {
-						if (!mh_strcasecmp(name, cptr->c_name)) {
-							if (! cptr->c_text) {
-								cptr->c_text = tmpbuf;
-								for (cp = tmpbuf + strlen (tmpbuf) - 1;
-										cp >= tmpbuf; cp--)
-									if (isspace (*cp))
-										*cp = 0;
-									else
-										break;
-								*--savecomp = cptr;
-								tmpbuf = *nxtbuf++;
-							}
+				** we're interested in this component,
+				** but find the right one in the hash
+				** collision chain ...
+				*/
+				do {
+					if (mh_strcasecmp(f.name, cptr->c_name)!=0) {
+						continue;
+					}
+					if (cptr->c_text) {
+						free(cptr->c_text);
+						cptr->c_text = NULL;
+					}
+					cptr->c_text = getcpy(f.value);
+					cp = cptr->c_text + strlen(cptr->c_text) - 1;
+					for (; cp >= cptr->c_text; cp--) {
+						if (isspace(*cp)) {
+							*cp = '\0';
+						} else {
 							break;
 						}
-					} while ((cptr = cptr->c_next));
-				}
-
-				while (state == FLDPLUS) {
-					state = m_getfld (state, name, tmpbuf, rlwidth, inb);
-					if (outnum)
-						FPUTS (tmpbuf);
-				}
-				break;
+					}
+					break;
+				} while ((cptr = cptr->c_next));
+			}
+			break;
 
-			case BODY:
-				compnum = -1;
-				if (! outnum) {
-					state = FILEEOF; /* stop now if scan cmd */
+		case BODY2:
+			compnum = -1;
+			if (scanfolder) {
+				/* stop here if we scan a msg in a folder */
+				state = FILEEOF2;
+				goto finished;
+			}
+			/* otherwise (mbox): snarf the body */
+			if (strncmp("From ", f.value, 5)==0) {
+				state = FILEEOF2;
+				goto finished;
+			}
+			if (incing) {
+				FPUTS("\n");
+				FPUTS(f.value);
+			}
+body:;
+			blankline = 0;
+			while ((state = m_getfld2(state, &f, inb)) == BODY2) {
+				/*
+				** recognize From lines without blank lines
+				** before them as well.
+				*/
+				if (strncmp("From ", f.value, 5)==0) {
+					state = FILEEOF2;
 					goto finished;
 				}
-				if (putc ('\n', scnout) == EOF) DIEWRERR();
-				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)
-							DIEWRERR ();
-					}
-#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
+				** delay the printing of blank lines
+				** because if it's the end of the message,
+				** then we must omit the blank line,
+				** as it is not part of the message but
+				** part of the mbox format
+				*/
+				if (blankline) {
+					/* print the delayed blank line */
+					FPUTS("\n");
+					blankline = 0;
 				}
-				goto finished;
-
-			case LENERR:
-			case FMTERR:
-				fprintf (stderr,
-						innum ? "??Format error (message %d) in "
-							  : "??Format error in ",
-						outnum ? outnum : innum);
-				fprintf (stderr, "component %d\n", compnum);
-
-				if (outnum) {
-					FPUTS ("\n\nBAD MSG:\n");
-					FPUTS (name);
-					if (putc ('\n', scnout) == EOF) DIEWRERR();
-					state = BODY;
-					goto body;
+				if (strcmp(f.value, "\n")==0) {
+					blankline = 1;
+					continue;
+				}
+				if (incing) {
+					FPUTS(f.value);
 				}
-				/* fall through */
+			}
+			goto finished;
+
+		case LENERR2:
+			advise(NULL, "line \"%s\" too long", trim(f.value));
+			goto handleerror;
 
-			case FILEEOF:
+		case FMTERR2:
+			if (strncmp("From ", f.value, 5)==0) {
+				state = FILEEOF2;
 				goto finished;
+			}
+			/* FALL */
+
+		case IOERR2:
+handleerror:;
+			fprintf(stderr, innum ?
+					"??Format error (message %d) in " :
+					"??Format error in ",
+					outnum ? outnum : innum);
+			fprintf(stderr, "component %d\n", compnum);
+
+			if (incing) {
+				FPUTS("\n\nBAD MSG:\n");
+				FPUTS(f.name);  /* XXX use f.field? */
+				FPUTS("\n");
+				state = BODY2;
+				goto body;
+			}
+			/* fall through if we scan only */
 
-			default:
-				adios (NULL, "getfld() returned %d", state);
+		case FILEEOF2:
+			goto finished;
+
+		default:
+			adios(EX_SOFTWARE, NULL, "getfld() returned %d", state);
 		}
 	}
 
-	/*
-	 * format and output the scan line.
-	 */
 finished:
+	/* Format and output the scan line. */
 	if (ferror(inb)) {
-		advise("read", "unable to"); /* "read error" */
+		advise("read", "unable to");
 		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(EX_IOERR, scnmsg, "write error on");
+	} else if (!scanfolder) {
+		if ((dat[2] = ftell(inb)) == EOF)
+			adios(EX_IOERR, scnmsg, "write error on");
+		dat[2] -= fpos;
 	}
 
-	if (size)
-		dat[2] = size;
-	else if (outnum > 0)
-	{
-		dat[2] = ftell(scnout);
-		if (dat[2] == EOF) DIEWRERR();
-	}
-
-	if ((datecomp && !datecomp->c_text) || (!size && !outnum)) {
-		struct stat st;
-
-		fstat (fileno(inb), &st);
-		if (!size && !outnum)
+	if (fmtstr) {
+		fstat(fileno(inb), &st);
+		if (scanfolder) {
 			dat[2] = st.st_size;
-		if (datecomp) {
-			if (! datecomp->c_text) {
-				if (datecomp->c_tws == NULL)
-					datecomp->c_tws = (struct tws *)
-						calloc((size_t) 1, sizeof(*datecomp->c_tws));
-				if (datecomp->c_tws == NULL)
-					adios (NULL, "unable to allocate tws buffer");
-				*datecomp->c_tws = *dlocaltime ((time_t *) &st.st_mtime);
+		}
+		if (datecomp && !datecomp->c_text) {
+			if (!datecomp->c_text) {
+				if (!datecomp->c_tws)
+					datecomp->c_tws = (struct tws *) mh_xcalloc((size_t) 1, sizeof(*datecomp->c_tws));
+				if (!datecomp->c_tws)
+					adios(EX_OSERR, NULL, "unable to allocate tws buffer");
+				*datecomp->c_tws = *dlocaltime((time_t *) &st.st_mtime);
 				datecomp->c_flags |= CF_DATEFAB|CF_TRUE;
 			} else {
 				datecomp->c_flags &= ~CF_DATEFAB;
 			}
 		}
-	}
-
-	fmt_scan (fmt, scanl, slwidth, dat);
-
-#if 0
-	fmt = fmt_scan (fmt, scanl, slwidth, dat);
-	if (!fmt)
-		fmt = fmt_top;  /* reset for old format files */
-#endif
-
-	if (bodycomp)
-		bodycomp->c_text = saved_c_text;
 
-	if (noisy)
-		fputs (scanl, stdout);
-
-	FINDCOMP (cptr, "encrypted");
-	encrypted = cptr && cptr->c_text;
-
-	/* return dynamically allocated buffers to pool */
-	while ((cptr = *savecomp++)) {
-		*--nxtbuf = cptr->c_text;
-		cptr->c_text = NULL;
+		/* print the scan line */
+		fmt_scan(fmt, scanl, slwidth, dat);
+		fputs(scanl, stdout);
 	}
-	*--nxtbuf = tmpbuf;
-
-	if (outnum && (ferror(scnout) || fclose (scnout) == EOF))
-		DIEWRERR();
 
-	return (state != FILEEOF ? SCNERR : encrypted ? SCNENC : SCNMSG);
-}
+	/* clean up old values */
+        for (i=0; i < sizeof(wantcomp)/sizeof(wantcomp[0]); i++) {
+		for (cptr=wantcomp[i]; cptr; cptr=cptr->c_next) {
+			if (cptr->c_text) {
+				free(cptr->c_text);
+				cptr->c_text = NULL;
+			}
+		}
+	}
 
-static int
-mh_fputs(char *s, FILE *stream)
-{
-	char c;
+	if (incing && (ferror(scnout) || fclose(scnout) == EOF))
+		adios(EX_IOERR, scnmsg, "write error on");
 
-	while ((c = *s++))
-		if (putc (c,stream) == EOF )
-			return(EOF);
-	return (0);
+	return (state == FILEEOF2 ? SCNMSG : SCNERR);
 }
-