X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fscan.c;h=6881c340c461f8b4b8a0ec9de7f88f590fafcf2b;hp=ea05cd2b930f31e445994952cd19b9f799536d38;hb=5d4f603fcfc7cf4a238b27de2b18567a733bb6b4;hpb=c2360569e1d8d3678e294eb7c1354cb8bf7501c1

diff --git a/uip/scan.c b/uip/scan.c
index ea05cd2..6881c34 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -44,13 +44,6 @@ static struct swit switches[] = {
 
 
 /*
-** global for sbr/formatsbr.c - yech!
-*/
-#ifdef LBL
-extern struct msgs *fmt_current_folder;
-#endif
-
-/*
 ** prototypes
 */
 void clear_screen(void);  /* from termsbr.c */
@@ -204,7 +197,7 @@ main(int argc, char **argv)
 	*/
 
 	if (!msgs.size)
-		app_msgarg(&msgs, "all");
+		app_msgarg(&msgs, seq_all);
 	if (!folder)
 		folder = getcurfol();
 	maildir = toabsdir(folder);
@@ -252,25 +245,12 @@ 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;
 			}
 
@@ -304,11 +284,7 @@ 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;
@@ -318,10 +294,6 @@ main(int argc, char **argv)
 		}
 	}
 
-#ifdef LBL
-	seq_save(mp);  /* because formatsbr might have made changes */
-#endif
-
 	folder_free(mp);  /* free folder/message structure */
 	if (clearflag)
 		clear_screen();