X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fscansbr.c;h=75dec1cfa8781ab6047b96204cd1ac4411cf56f0;hp=67fc5eb294e36d187525d1af5f123920ac9e3124;hb=e954d689b5adafa4ec74e7dbd1e087dbf998f6d6;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 67fc5eb..75dec1c 100644
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -37,32 +37,28 @@
 #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 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 */
+char *scanl = NULL;  /* text of most recent scanline */
 
-#define DIEWRERR() adios (scnmsg, "write error on")
+#define DIEWRERR() adios(scnmsg, "write error on")
 
 #define FPUTS(buf) {\
-		if (mh_fputs(buf,scnout) == EOF)\
+		if (fputs(buf,scnout) == EOF)\
 			DIEWRERR();\
 	}
 
 /*
 ** prototypes
 */
-int sc_width (void);  /* from termsbr.c */
-static int mh_fputs(char *, FILE *);
+int sc_width(void);  /* from termsbr.c */
 
 #ifdef MULTIBYTE_SUPPORT
 #define SCAN_CHARWIDTH MB_CUR_MAX
@@ -71,10 +67,10 @@ 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;
+	int i, compnum, state;
 	unsigned char *cp, *tmpbuf;
 	char **nxtbuf;
 	char *saved_c_text = NULL;
@@ -84,16 +80,13 @@ 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
 
 	/* first-time only initialization */
 	if (!scanl) {
 		if (width == 0) {
-			if ((width = sc_width ()) < WIDTH/2)
+			if ((width = sc_width()) < WIDTH/2)
 				width = WIDTH/2;
 			else if (width > MAXSCANL)
 				width = MAXSCANL;
@@ -105,36 +98,18 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 			umask(~m_gmprot());
 
 		/* Compile format string */
-		ncomps = fmt_compile (nfs, &fmt) + 1;
+		ncomps = fmt_compile(fmtstr, &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++;
-		}
-		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");
+			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");
+			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--; )
@@ -155,7 +130,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 	** 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, rlwidth, inb)) == FILEEOF) {
 		if (ferror(inb)) {
 			advise("read", "unable to"); /* "read error" */
 			return SCNFAT;
@@ -166,144 +141,139 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 
 	if (outnum) {
 		if (outnum > 0) {
-			scnmsg = m_name (outnum);
+			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
+		if ((scnout = fopen(scnmsg, "w")) == NULL)
+			adios(scnmsg, "unable to write");
 		/*
 		** Add the Return-Path and Delivery-Date
 		** header fields to message.
 		*/
-		if (get_returnpath (returnpath, sizeof(returnpath),
+		if (get_returnpath(returnpath, sizeof(returnpath),
 				deliverydate, sizeof(deliverydate))) {
-			FPUTS ("Return-Path: ");
-			FPUTS (returnpath);
-			FPUTS ("Delivery-Date: ");
-			FPUTS (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)) {
+			state = m_getfld(state, name, tmpbuf, rlwidth, inb)) {
 		switch (state) {
-			case FLD:
-			case FLDPLUS:
-				compnum++;
-				if (outnum) {
-					FPUTS (name);
-					if ( putc (':', scnout) == EOF)
-						DIEWRERR();
-					FPUTS (tmpbuf);
-				}
-				/*
-				** 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++;
-							}
-							break;
+		case FLD:
+		case FLDPLUS:
+			compnum++;
+			if (outnum) {
+				FPUTS(name);
+				if (putc(':', scnout) == EOF)
+					DIEWRERR();
+				FPUTS(tmpbuf);
+			}
+			/*
+			** 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++;
 						}
-					} while ((cptr = cptr->c_next));
-				}
+						break;
+					}
+				} while ((cptr = cptr->c_next));
+			}
 
-				while (state == FLDPLUS) {
-					state = m_getfld (state, name, tmpbuf, rlwidth, inb);
-					if (outnum)
-						FPUTS (tmpbuf);
-				}
-				break;
+			while (state == FLDPLUS) {
+				state = m_getfld(state, name, tmpbuf, rlwidth,
+						inb);
+				if (outnum)
+					FPUTS(tmpbuf);
+			}
+			break;
 
-			case BODY:
-				compnum = -1;
-				if (! outnum) {
-					state = FILEEOF; /* stop now if scan cmd */
-					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".
-				*/
+		case BODY:
+			compnum = -1;
+			if (! outnum) {
+				state = FILEEOF; /* stop now if scan cmd */
+				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) {
+			while (state == BODY) {
 #ifdef LINUX_STDIO
-					if (scnout->_IO_write_ptr == scnout->_IO_write_end) {
+				if (scnout->_IO_write_ptr == scnout->_IO_write_end) {
 #elif defined(__DragonFly__)
-					if (((struct __FILE_public *)scnout)->_w <= 0) {
+				if (((struct __FILE_public *)scnout)->_w <= 0) {
 #else
-					if (scnout->_cnt <= 0) {
+				if (scnout->_cnt <= 0) {
 #endif
-						if (fflush(scnout) == EOF)
-							DIEWRERR ();
-					}
+					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;
+				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;
+				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;
+				state = m_getfld( state, name, scnout->_ptr, -(scnout->_cnt), inb);
+				scnout->_cnt -= msg_count;
+				scnout->_ptr += msg_count;
 #endif
-				}
-				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;
-				}
-				/* fall through */
+			}
+			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;
+			}
+			/* fall through */
 
-			case FILEEOF:
-				goto finished;
+		case FILEEOF:
+			goto finished;
 
-			default:
-				adios (NULL, "getfld() returned %d", state);
+		default:
+			adios(NULL, "getfld() returned %d", state);
 		}
 	}
 
@@ -322,27 +292,25 @@ finished:
 		bodycomp->c_text = tmpbuf;
 	}
 
-	if (size)
-		dat[2] = size;
-	else if (outnum > 0) {
+	if (outnum > 0) {
 		dat[2] = ftell(scnout);
-		if (dat[2] == EOF) DIEWRERR();
+		if (dat[2] == EOF)
+			DIEWRERR();
 	}
 
-	if ((datecomp && !datecomp->c_text) || (!size && !outnum)) {
+	if ((datecomp && !datecomp->c_text) || !outnum) {
 		struct stat st;
 
-		fstat (fileno(inb), &st);
-		if (!size && !outnum)
+		fstat(fileno(inb), &st);
+		if (!outnum)
 			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));
+					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);
+					adios(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;
@@ -350,22 +318,13 @@ finished:
 		}
 	}
 
-	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
+	fmt_scan(fmt, scanl, slwidth, dat);
 
 	if (bodycomp)
 		bodycomp->c_text = saved_c_text;
 
-	if (noisy)
-		fputs (scanl, stdout);
-
-	FINDCOMP (cptr, "encrypted");
-	encrypted = cptr && cptr->c_text;
+	if (fmtstr)
+		fputs(scanl, stdout);
 
 	/* return dynamically allocated buffers to pool */
 	while ((cptr = *savecomp++)) {
@@ -374,19 +333,8 @@ finished:
 	}
 	*--nxtbuf = tmpbuf;
 
-	if (outnum && (ferror(scnout) || fclose (scnout) == EOF))
+	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;
-
-	while ((c = *s++))
-		if (putc (c,stream) == EOF )
-			return(EOF);
-	return (0);
+	return (state != FILEEOF ? SCNERR : SCNMSG);
 }