X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fscansbr.c;h=ca98c5aef2b9a36df756ca51a89a500978eaa7c2;hb=aa60b0ab5e804f8befa890c0a6df0e3143ce0723;hp=bbd46261832af013b539726a44f95fa83140c3c9;hpb=e6c75593757a6edb5eb8e98bfc50f0c1de36bf2f;p=mmh

diff --git a/uip/scansbr.c b/uip/scansbr.c
index bbd4626..ca98c5a 100644
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -48,11 +48,9 @@ static int dat[5];  /* aux. data for format routine */
 
 char *scanl = NULL;  /* text of most recent scanline */
 
-#define DIEWRERR() adios(scnmsg, "write error on")
-
 #define FPUTS(buf) {\
 		if (fputs(buf,scnout) == EOF)\
-			DIEWRERR();\
+			adios(scnmsg, "write error on");\
 	}
 
 /*
@@ -67,8 +65,8 @@ int sc_width(void);  /* from termsbr.c */
 #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, state;
 	unsigned char *cp, *tmpbuf;
@@ -80,11 +78,10 @@ scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 	FILE *scnout = NULL;
 	char name[NAMESZ];
 	static int rlwidth, slwidth;
-
-#ifdef RPATHS
 	char returnpath[BUFSIZ];
 	char deliverydate[BUFSIZ];
-#endif
+	int incing = (outnum > 0);
+	int ismbox = (outnum != 0);
 
 	/* first-time only initialization */
 	if (!scanl) {
@@ -97,20 +94,14 @@ 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)
+		if (incing)
 			umask(~m_gmprot());
 
 		/* Compile format string */
-		ncomps = fmt_compile(nfs, &fmt) + 1;
+		ncomps = fmt_compile(fmtstr, &fmt) + 1;
 
 		FINDCOMP(bodycomp, "body");
 		FINDCOMP(datecomp, "date");
-		FINDCOMP(cptr, "folder");
-		if (cptr && folder)
-			cptr->c_text = folder;
-		FINDCOMP(cptr, "dtimenow");
-		if (cptr)
-			cptr->c_text = getcpy(dtimenow(0));
 		nxtbuf = compbuffers = (char **) calloc((size_t) ncomps,
 				sizeof(char *));
 		if (nxtbuf == NULL)
@@ -148,17 +139,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 (incing) {
+		scnmsg = m_name(outnum);
+		if (*scnmsg == '?')  /* msg num out of range */
+			return SCNNUM;
 		if ((scnout = fopen(scnmsg, "w")) == NULL)
 			adios(scnmsg, "unable to write");
-#ifdef RPATHS
 		/*
 		** Add the Return-Path and Delivery-Date
 		** header fields to message.
@@ -170,7 +156,6 @@ scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 			FPUTS("Delivery-Date: ");
 			FPUTS(deliverydate);
 		}
-#endif /* RPATHS */
 	}
 
 	/* scan - main loop */
@@ -180,10 +165,10 @@ 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();
+					adios(scnmsg, "write error on");
 				FPUTS(tmpbuf);
 			}
 			/*
@@ -214,18 +199,19 @@ scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 			while (state == FLDPLUS) {
 				state = m_getfld(state, name, tmpbuf, rlwidth,
 						inb);
-				if (outnum)
+				if (incing)
 					FPUTS(tmpbuf);
 			}
 			break;
 
 		case BODY:
 			compnum = -1;
-			if (! outnum) {
-				state = FILEEOF; /* stop now if scan cmd */
+			if (!incing) {
+				state = FILEEOF; /* stop here if scan cmd */
 				goto finished;
 			}
-			if (putc('\n', scnout) == EOF) DIEWRERR();
+			if (putc('\n', scnout) == EOF)
+				adios(scnmsg, "write error on");
 			FPUTS(tmpbuf);
 			/*
 			** performance hack: some people like to run "inc"
@@ -248,7 +234,7 @@ body:;
 				if (scnout->_cnt <= 0) {
 #endif
 					if (fflush(scnout) == EOF)
-						DIEWRERR();
+						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);
@@ -258,7 +244,7 @@ body:;
 				((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);
+				state = m_getfld(state, name, scnout->_ptr, -(scnout->_cnt), inb);
 				scnout->_cnt -= msg_count;
 				scnout->_ptr += msg_count;
 #endif
@@ -270,11 +256,13 @@ body:;
 			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();
+					adios(scnmsg, "write error on");
+			}
+			if (ismbox) {
 				state = BODY;
 				goto body;
 			}
@@ -288,12 +276,11 @@ body:;
 		}
 	}
 
-	/*
-	** 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;
 	}
 
@@ -303,19 +290,16 @@ finished:
 		bodycomp->c_text = tmpbuf;
 	}
 
-	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");
 	}
 
-	if ((datecomp && !datecomp->c_text) || (!size && !outnum)) {
+	if ((datecomp && !datecomp->c_text) || !ismbox) {
 		struct stat st;
 
 		fstat(fileno(inb), &st);
-		if (!size && !outnum)
+		if (!ismbox)
 			dat[2] = st.st_size;
 		if (datecomp) {
 			if (! datecomp->c_text) {
@@ -331,14 +315,14 @@ finished:
 		}
 	}
 
+	/* print the scan line */
 	fmt_scan(fmt, scanl, slwidth, dat);
+	if (fmtstr)
+		fputs(scanl, stdout);
 
 	if (bodycomp)
 		bodycomp->c_text = saved_c_text;
 
-	if (noisy)
-		fputs(scanl, stdout);
-
 	/* return dynamically allocated buffers to pool */
 	while ((cptr = *savecomp++)) {
 		*--nxtbuf = cptr->c_text;
@@ -346,8 +330,8 @@ finished:
 	}
 	*--nxtbuf = tmpbuf;
 
-	if (outnum && (ferror(scnout) || fclose(scnout) == EOF))
-		DIEWRERR();
+	if (incing && (ferror(scnout) || fclose(scnout) == EOF))
+		adios(scnmsg, "write error on");
 
 	return (state != FILEEOF ? SCNERR : SCNMSG);
 }