From 51d0e643f8daeb2db8de0a3d31d7d7f038b48380 Mon Sep 17 00:00:00 2001
From: markus schnalke <meillo@marmaro.de>
Date: Tue, 20 Mar 2012 17:36:02 +0100
Subject: [PATCH] Removed special `folder' and `dtimenow' format escapes from
 scan listings. Also removed the unused parameter `size'.

---
 h/scansbr.h   |    2 +-
 uip/inc.c     |    2 +-
 uip/scan.c    |    5 ++---
 uip/scansbr.c |   16 ++++------------
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/h/scansbr.h b/h/scansbr.h
index b07feef..4e2e87a 100644
--- a/h/scansbr.h
+++ b/h/scansbr.h
@@ -24,4 +24,4 @@ extern char *scanl;
 /*
 ** prototypes
 */
-int scan(FILE *, int, int, char *, int, int, int, char *, long, int);
+int scan(FILE *, int, int, char *, int, int, int, int);
diff --git a/uip/inc.c b/uip/inc.c
index 04572c0..2297a03 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -389,7 +389,7 @@ main(int argc, char **argv)
 
 		/* create scanline for new message */
 		switch (incerr = scan(in, msgnum + 1, msgnum + 1, nfs, width,
-			msgnum == hghnum && chgflag, 1, NULL, 0L, noisy)) {
+			msgnum == hghnum && chgflag, 1, noisy)) {
 		case SCNFAT:
 		case SCNEOF:
 			break;
diff --git a/uip/scan.c b/uip/scan.c
index 1520553..ef13e39 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -127,8 +127,7 @@ main(int argc, char **argv)
 
 		m_unknown(in);
 		for (msgnum = 1; ; ++msgnum) {
-			state = scan(in, msgnum, -1, nfs, width, 0, 0,
-					NULL, 0L, 1);
+			state = scan(in, msgnum, -1, nfs, width, 0, 0, 1);
 			if (state != SCNMSG)
 				break;
 		}
@@ -208,7 +207,7 @@ main(int argc, char **argv)
 
 			switch (state = scan(in, msgnum, 0, nfs, width,
 						msgnum == mp->curmsg, unseen,
-						folder, 0L, 1)) {
+						1)) {
 			case SCNMSG:
 			case SCNERR:
 				break;
diff --git a/uip/scansbr.c b/uip/scansbr.c
index bbd4626..1c68bc2 100644
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -68,7 +68,7 @@ int sc_width(void);  /* from termsbr.c */
 
 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, state;
 	unsigned char *cp, *tmpbuf;
@@ -105,12 +105,6 @@ scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
 
 		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)
@@ -303,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) {
-- 
1.7.10.4