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

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 4b71243..75dec1c 100644
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -41,17 +41,17 @@ 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 = 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 FPUTS(buf) {\
-		if (mh_fputs(buf,scnout) == EOF)\
+		if (fputs(buf,scnout) == EOF)\
 			DIEWRERR();\
 	}
 
@@ -59,7 +59,6 @@ char *scanl = 0;  /* text of most recent scanline */
 ** prototypes
 */
 int sc_width(void);  /* from termsbr.c */
-static int mh_fputs(char *, FILE *);
 
 #ifdef MULTIBYTE_SUPPORT
 #define SCAN_CHARWIDTH MB_CUR_MAX
@@ -68,8 +67,8 @@ 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, state;
 	unsigned char *cp, *tmpbuf;
@@ -81,11 +80,8 @@ 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) {
@@ -102,16 +98,10 @@ 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;
 
 		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)
@@ -159,7 +149,6 @@ scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 		}
 		if ((scnout = fopen(scnmsg, "w")) == NULL)
 			adios(scnmsg, "unable to write");
-#ifdef RPATHS
 		/*
 		** Add the Return-Path and Delivery-Date
 		** header fields to message.
@@ -171,7 +160,6 @@ scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 			FPUTS("Delivery-Date: ");
 			FPUTS(deliverydate);
 		}
-#endif /* RPATHS */
 	}
 
 	/* scan - main loop */
@@ -304,19 +292,17 @@ 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 ((datecomp && !datecomp->c_text) || (!size && !outnum)) {
+	if ((datecomp && !datecomp->c_text) || !outnum) {
 		struct stat st;
 
 		fstat(fileno(inb), &st);
-		if (!size && !outnum)
+		if (!outnum)
 			dat[2] = st.st_size;
 		if (datecomp) {
 			if (! datecomp->c_text) {
@@ -337,7 +323,7 @@ finished:
 	if (bodycomp)
 		bodycomp->c_text = saved_c_text;
 
-	if (noisy)
+	if (fmtstr)
 		fputs(scanl, stdout);
 
 	/* return dynamically allocated buffers to pool */
@@ -352,14 +338,3 @@ finished:
 
 	return (state != FILEEOF ? SCNERR : SCNMSG);
 }
-
-static int
-mh_fputs(char *s, FILE *stream)
-{
-	char c;
-
-	while ((c = *s++))
-		if (putc(c,stream) == EOF )
-			return(EOF);
-	return (0);
-}