From 3fe7a0704e4ab592003af2e66c3003718ecde2c1 Mon Sep 17 00:00:00 2001
From: markus schnalke <meillo@marmaro.de>
Date: Wed, 25 Jan 2012 22:21:56 +0100
Subject: [PATCH] Removed (allmost all) JLR-specific code. There still is one
 fragment in fmt_scan(), of which I don't understand the
 logic. I don't want to remove stuff I don't understand.

---
 sbr/fmt_scan.c |   11 ++++++-----
 uip/scan.c     |   12 ------------
 uip/scansbr.c  |    6 ------
 3 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 2609679..4a8da14 100644
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -877,13 +877,14 @@ fmt_scan(struct format *format, char *scanl, int width, int *dat)
 		}
 		fmt++;
 	}
-#ifndef JLR
-	finished:;
+finished:;
 	if (cp[-1] != '\n')
 		*cp++ = '\n';
-	*cp   = 0;
+	*cp = '\0';
 	return ((struct format *)0);
-#else /* JLR */
+
+#ifdef JLR
+	/* I'll remove this as soon as I understand what it does. --meillo */
 	if (cp[-1] != '\n')
 		*cp++ = '\n';
 	while (fmt->f_type != FT_DONE)
@@ -892,6 +893,6 @@ fmt_scan(struct format *format, char *scanl, int width, int *dat)
 	finished:;
 	*cp = '\0';
 	return (fmt->f_value ? ++fmt : (struct format *) 0);
-
 #endif /* JLR */
+
 }
diff --git a/uip/scan.c b/uip/scan.c
index 6881c34..cb4bac4 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -175,12 +175,6 @@ main(int argc, char **argv)
 			adios(file, "unable to open");
 		}
 
-#ifndef JLR
-		if (hdrflag) {
-			printf("FOLDER %s\t%s\n", file, dtimenow(1));
-		}
-#endif /* JLR */
-
 		m_unknown(in);
 		for (msgnum = 1; ; ++msgnum) {
 			state = scan(in, msgnum, -1, nfs, width, 0, 0,
@@ -254,12 +248,6 @@ main(int argc, char **argv)
 				continue;
 			}
 
-#ifndef JLR
-			if (hdrflag) {
-				printf("FOLDER %s\t%s\n", folder, dtimenow(1));
-			}
-#endif /* JLR */
-
 			/*
 			** Check if message is in any sequence given
 			** by Unseen-Sequence profile entry.
diff --git a/uip/scansbr.c b/uip/scansbr.c
index 8e02e57..a43044c 100644
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -37,9 +37,6 @@
 #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) */
@@ -107,9 +104,6 @@ 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");
-- 
1.7.10.4