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

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 9617237..7dedf70 100644
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -38,25 +38,22 @@ static struct format *fmt;
 
 static struct comp *datecomp;  /* pntr to "date" comp */
 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 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 */
 
-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(scnmsg, "write error on");\
 	}
 
 /*
 ** prototypes
 */
 int sc_width(void);  /* from termsbr.c */
-static int mh_fputs(char *, FILE *);
 
 #ifdef MULTIBYTE_SUPPORT
 #define SCAN_CHARWIDTH MB_CUR_MAX
@@ -65,10 +62,11 @@ 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;
+	static int slwidth;
+	int i, compnum, state;
 	unsigned char *cp, *tmpbuf;
 	char **nxtbuf;
 	struct comp *cptr;
@@ -76,12 +74,11 @@ scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 	char *scnmsg = NULL;
 	FILE *scnout = NULL;
 	char name[NAMESZ];
-	static int slwidth;
-
-#ifdef RPATHS
 	char returnpath[BUFSIZ];
 	char deliverydate[BUFSIZ];
-#endif
+	int incing = (outnum > 0);
+	int scanfolder = (outnum == 0);
+	long fpos;
 
 	/* first-time only initialization */
 	if (!scanl) {
@@ -93,37 +90,26 @@ scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 		}
 		dat[3] = slwidth = width;
 		scanl = (char *) mh_xmalloc((size_t) SCAN_CHARWIDTH *
-				(slwidth + 2) );
-		if (outnum)
+				(slwidth + 2));  /* probably for \n and \0 */
+		if (incing)
 			umask(~m_gmprot());
 
 		/* Compile format string */
-		ncomps = fmt_compile(nfs, &fmt) + 1;
+		ncomps = fmt_compile(fmtstr, &fmt) + 1;
 
 		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++;
-		}
-		FINDCOMP(cptr, "dtimenow");
-		if (cptr)
-			cptr->c_text = getcpy(dtimenow(0));
 		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;
+		/* NULL-terminate array */
+		used_buf += ncomps;
+		*used_buf = NULL;
+		/* allocate space for the items */
 		for (i = ncomps; i--; )
 			*nxtbuf++ = mh_xmalloc(SBUFSIZ);
 	}
@@ -137,6 +123,7 @@ scan(FILE *inb, int innum, int outnum, char *nfs, 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
@@ -151,17 +138,12 @@ scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 		}
 	}
 
-	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)
+	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");
-#ifdef RPATHS
 		/*
 		** Add the Return-Path and Delivery-Date
 		** header fields to message.
@@ -173,7 +155,6 @@ scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 			FPUTS("Delivery-Date: ");
 			FPUTS(deliverydate);
 		}
-#endif /* RPATHS */
 	}
 
 	/* scan - main loop */
@@ -183,10 +164,9 @@ scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 		case FLD:
 		case FLDPLUS:
 			compnum++;
-			if (outnum) {
+			if (incing) {
 				FPUTS(name);
-				if (putc(':', scnout) == EOF)
-					DIEWRERR();
+				FPUTS(":");
 				FPUTS(tmpbuf);
 			}
 			/*
@@ -217,13 +197,34 @@ scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 			while (state == FLDPLUS) {
 				state = m_getfld(state, name, tmpbuf, SBUFSIZ,
 						inb);
-				if (outnum)
+				if (incing)
 					FPUTS(tmpbuf);
 			}
 			break;
 
 		case BODY:
-			state = FILEEOF;
+			compnum = -1;
+			if (!incing) {
+				/* 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;
+			}
+			FPUTS("\n");
+			FPUTS(tmpbuf);
+body:;
+			while (state == BODY) {
+				state = m_getfld(state, name, tmpbuf, SBUFSIZ,
+						inb);
+				FPUTS(tmpbuf);
+			}
 			goto finished;
 
 		case LENERR:
@@ -231,13 +232,14 @@ scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 			fprintf(stderr, innum ? "??Format error (message %d) in " : "??Format error in ", outnum ? outnum : innum);
 			fprintf(stderr, "component %d\n", compnum);
 
-			if (outnum) {
+			if (incing) {
 				FPUTS("\n\nBAD MSG:\n");
 				FPUTS(name);
-				if (putc('\n', scnout) == EOF)
-					DIEWRERR();
+				FPUTS("\n");
+				state = BODY;
+				goto body;
 			}
-			/* fall through */
+			/* fall through if we scan only */
 
 		case FILEEOF:
 			goto finished;
@@ -247,34 +249,34 @@ scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 		}
 	}
 
-	/*
-	** 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;
 	}
 
-	if (size)
-		dat[2] = size;
-	else if (outnum > 0) {
-		dat[2] = ftell(scnout);
-		if (dat[2] == EOF)
-			DIEWRERR();
+	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) || (!size && !outnum)) {
+	if ((datecomp && !datecomp->c_text) || scanfolder) {
 		struct stat st;
 
 		fstat(fileno(inb), &st);
-		if (!size && !outnum)
+		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;
@@ -284,14 +286,11 @@ finished:
 		}
 	}
 
+	/* print the scan line */
 	fmt_scan(fmt, scanl, slwidth, dat);
-
-	if (noisy)
+	if (fmtstr)
 		fputs(scanl, stdout);
 
-	FINDCOMP(cptr, "encrypted");
-	encrypted = cptr && cptr->c_text;
-
 	/* return dynamically allocated buffers to pool */
 	while ((cptr = *savecomp++)) {
 		*--nxtbuf = cptr->c_text;
@@ -299,19 +298,8 @@ finished:
 	}
 	*--nxtbuf = tmpbuf;
 
-	if (outnum && (ferror(scnout) || fclose(scnout) == EOF))
-		DIEWRERR();
-
-	return (state != FILEEOF ? SCNERR : encrypted ? SCNENC : SCNMSG);
-}
-
-static int
-mh_fputs(char *s, FILE *stream)
-{
-	char c;
+	if (incing && (ferror(scnout) || fclose(scnout) == EOF))
+		adios(scnmsg, "write error on");
 
-	while ((c = *s++))
-		if (putc(c,stream) == EOF )
-			return(EOF);
-	return (0);
+	return (state != FILEEOF ? SCNERR : SCNMSG);
 }