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

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 69f385a..75dec1c 100644
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -67,7 +67,7 @@ int sc_width(void);  /* from termsbr.c */
 #endif
 
 int
-scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
+scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg,
 	int unseen)
 {
 	int i, compnum, state;
@@ -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,7 +98,7 @@ 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");
@@ -152,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.
@@ -164,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 */
@@ -328,7 +323,7 @@ finished:
 	if (bodycomp)
 		bodycomp->c_text = saved_c_text;
 
-	if (nfs)
+	if (fmtstr)
 		fputs(scanl, stdout);
 
 	/* return dynamically allocated buffers to pool */