X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fscan.c;h=e5fb55a652440de6d1bc3e8fa30e101ada7567e9;hb=2c3b7da72126a21f05130e9ed6bb70f43624ce25;hp=478e4a6965bae6d0504ee61d4f8e2b35eab666ad;hpb=3cc8ed080f6e741b8df04a3ebe764c659e75cb38;p=mmh

diff --git a/uip/scan.c b/uip/scan.c
index 478e4a6..e5fb55a 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -23,34 +23,23 @@ static struct swit switches[] = {
 	{ "form formatfile", 0 },
 #define FMTSW  3
 	{ "format string", 5 },
-#define HEADSW  4
-	{ "header", 0 },
-#define NHEADSW  5
-	{ "noheader", 0 },
-#define WIDTHSW  6
+#define WIDTHSW  4
 	{ "width columns", 0 },
-#define REVSW  7
+#define REVSW  5
 	{ "reverse", 0 },
-#define NREVSW  8
+#define NREVSW  6
 	{ "noreverse", 0 },
-#define FILESW  9
+#define FILESW  7
 	{ "file file", 4 },
-#define VERSIONSW 10
+#define VERSIONSW 8
 	{ "version", 0 },
-#define HELPSW  11
+#define HELPSW  9
 	{ "help", 0 },
 	{ NULL, 0 }
 };
 
 
 /*
-** global for sbr/formatsbr.c - yech!
-*/
-#ifdef LBL
-extern struct msgs *fmt_current_folder;
-#endif
-
-/*
 ** prototypes
 */
 void clear_screen(void);  /* from termsbr.c */
@@ -59,7 +48,7 @@ void clear_screen(void);  /* from termsbr.c */
 int
 main(int argc, char **argv)
 {
-	int clearflag = 0, hdrflag = 0, ontty;
+	int clearflag = 0, ontty;
 	int width = 0, revflag = 0;
 	int i, state, msgnum;
 	int seqnum[NUMATTRS], unseen, num_unseen_seq = 0;
@@ -122,13 +111,6 @@ main(int argc, char **argv)
 				form = NULL;
 				continue;
 
-			case HEADSW:
-				hdrflag++;
-				continue;
-			case NHEADSW:
-				hdrflag = 0;
-				continue;
-
 			case WIDTHSW:
 				if (!(cp = *argp++) || *cp == '-')
 					adios(NULL, "missing argument to %s",
@@ -182,16 +164,10 @@ 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,
-					hdrflag ? file : NULL, 0L, 1);
+					NULL, 0L, 1);
 			if (state != SCNMSG && state != SCNENC)
 				break;
 		}
@@ -252,34 +228,15 @@ main(int argc, char **argv)
 
 	ontty = isatty(fileno(stdout));
 
-#ifdef LBL
-	else
-		fmt_current_folder = mp;
-#endif
-
 	for (msgnum = revflag ? mp->hghsel : mp->lowsel;
 		 (revflag ? msgnum >= mp->lowsel : msgnum <= mp->hghsel);
 		 msgnum += (revflag ? -1 : 1)) {
 		if (is_selected(mp, msgnum)) {
 			if ((in = fopen(cp = m_name(msgnum), "r")) == NULL) {
-#if 0
-				if (errno != EACCES)
-#endif
-					admonish(cp, "unable to open message");
-#if 0
-				else
-					printf("%*d  unreadable\n",
-							DMAXFOLDER, msgnum);
-#endif
+				admonish(cp, "unable to open message");
 				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.
@@ -304,24 +261,15 @@ main(int argc, char **argv)
 				adios(NULL, "scan() botch(%d)", state);
 
 			case SCNEOF:
-#if 0
-				printf("%*d  empty\n", DMAXFOLDER, msgnum);
-#else
 				advise(NULL, "message %d: empty", msgnum);
-#endif
 				break;
 			}
-			hdrflag = 0;
 			fclose(in);
 			if (ontty)
 				fflush(stdout);
 		}
 	}
 
-#ifdef LBL
-	seq_save(mp);  /* because formatsbr might have made changes */
-#endif
-
 	folder_free(mp);  /* free folder/message structure */
 	if (clearflag)
 		clear_screen();