X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fscan.c;h=cb4bac461f5a22dc0c58b244bf63b3aa9d041481;hb=3fe7a0704e4ab592003af2e66c3003718ecde2c1;hp=69c2da97a13b4eeb9ff4176f6f34396ba4198b76;hpb=5b792c4424571f05bc2008e3109797d18d7d00d1;p=mmh

diff --git a/uip/scan.c b/uip/scan.c
index 69c2da9..cb4bac4 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 */
@@ -182,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,
@@ -204,7 +191,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);
@@ -231,52 +218,36 @@ main(int argc, char **argv)
 	context_save();  /* save the context file */
 
 	/*
-	** Get the sequence number for each sequence
-	** specified by Unseen-Sequence
+	** Get the sequence number for each `unseen' sequence
 	*/
-	if ((cp = context_find(usequence)) && *cp) {
+	if (!(cp = context_find(usequence))) {
+		cp = seq_unseen;  /* use default, if not set */
+	}
+	if (*cp) {
 		char **ap, *dp;
 
 		dp = getcpy(cp);
 		ap = brkstring(dp, " ", "\n");
-		for (i = 0; ap && *ap; i++, ap++)
+		for (i = 0; ap && *ap; i++, ap++) {
 			seqnum[i] = seq_getnum(mp, *ap);
-
+		}
 		num_unseen_seq = i;
-		if (dp)
+		if (dp) {
 			free(dp);
+		}
 	}
 
 	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.
@@ -301,11 +272,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;
@@ -315,10 +282,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();