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

diff --git a/uip/scansbr.c b/uip/scansbr.c
index bbd4626..75dec1c 100644
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -67,8 +67,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 +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) {
@@ -101,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)
@@ -158,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.
@@ -170,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 */
@@ -303,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) {
@@ -336,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 */