X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fscansbr.c;h=1c68bc26d53afbfa4bfe8297f4b5a9ec40a3543d;hp=8e02e575473ea4dd4ee42eaaf63822b48c556537;hb=51d0e643f8daeb2db8de0a3d31d7d7f038b48380;hpb=9f9bfa91d88b3ca4cd9206c1f2b17c6d13ebcaba

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 8e02e57..1c68bc2 100644
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -37,24 +37,21 @@
 #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 FPUTS(buf) {\
-		if (mh_fputs(buf,scnout) == EOF)\
+		if (fputs(buf,scnout) == EOF)\
 			DIEWRERR();\
 	}
 
@@ -62,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
@@ -72,9 +68,9 @@ static int mh_fputs(char *, FILE *);
 
 int
 scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
-	int unseen, char *folder, long size, int noisy)
+	int unseen, int noisy)
 {
-	int i, compnum, encrypted, state;
+	int i, compnum, state;
 	unsigned char *cp, *tmpbuf;
 	char **nxtbuf;
 	char *saved_c_text = NULL;
@@ -107,25 +103,8 @@ scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 		/* Compile format string */
 		ncomps = fmt_compile(nfs, &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)
@@ -318,19 +297,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) {
@@ -354,9 +331,6 @@ finished:
 	if (noisy)
 		fputs(scanl, stdout);
 
-	FINDCOMP(cptr, "encrypted");
-	encrypted = cptr && cptr->c_text;
-
 	/* return dynamically allocated buffers to pool */
 	while ((cptr = *savecomp++)) {
 		*--nxtbuf = cptr->c_text;
@@ -367,16 +341,5 @@ finished:
 	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);
 }