X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fscan.c;h=018cd9cd9791bfc5eb0b06590d5e4839e27e0216;hp=671509afa0959d7a654ffceaf5cc1f44244a9e50;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=e2550f03c9679b6fcc5240f9cda48bd5a9951e3a

diff --git a/uip/scan.c b/uip/scan.c
index 671509a..018cd9c 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -30,6 +30,7 @@ static struct swit switches[] = {
 	{ NULL, 0 }
 };
 
+char *version=VERSION;
 
 int
 main(int argc, char **argv)
@@ -124,7 +125,6 @@ main(int argc, char **argv)
 			adios(EX_IOERR, file, "unable to open");
 		}
 
-		thisisanmbox(in);
 		for (msgnum = 1; ; ++msgnum) {
 			state = scan(in, msgnum, SCN_MBOX, fmtstr, width, 0, 0);
 			if (state != SCNMSG)
@@ -147,7 +147,6 @@ main(int argc, char **argv)
 	if (chdir(maildir) == NOTOK)
 		adios(EX_OSERR, maildir, "unable to change directory to");
 
-	/* read folder and create message structure */
 	if (!(mp = folder_read(folder)))
 		adios(EX_IOERR, NULL, "unable to read folder %s", folder);
 
@@ -159,11 +158,11 @@ main(int argc, char **argv)
 	for (msgnum = 0; msgnum < msgs.size; msgnum++)
 		if (!m_convert(mp, msgs.msgs[msgnum]))
 			exit(EX_USAGE);
-	seq_setprev(mp);  /* set the Previous-Sequence */
+	seq_setprev(mp);
 
-	context_replace(curfolder, folder);  /* update current folder */
-	seq_save(mp);  /* synchronize message sequences */
-	context_save();  /* save the context file */
+	context_replace(curfolder, folder);
+	seq_save(mp);
+	context_save();
 
 	/*
 	** Get the sequence number for each `unseen' sequence
@@ -186,42 +185,43 @@ main(int argc, char **argv)
 	}
 
 	for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
-		if (is_selected(mp, msgnum)) {
-			if ((in = fopen(cp = m_name(msgnum), "r")) == NULL) {
-				admonish(cp, "unable to open message");
-				continue;
-			}
+		if (!is_selected(mp, msgnum)) {
+			continue;
+		}
 
-			/*
-			** Check if message is in any sequence given
-			** by Unseen-Sequence profile entry.
-			*/
-			unseen = 0;
-			for (i = 0; i < num_unseen_seq; i++) {
-				if (in_sequence(mp, seqnum[i], msgnum)) {
-					unseen = 1;
-					break;
-				}
-			}
+		if ((in = fopen(cp = m_name(msgnum), "r")) == NULL) {
+			admonish(cp, "unable to open message");
+			continue;
+		}
 
-			switch (state = scan(in, msgnum, SCN_FOLD, fmtstr,
-					width, msgnum==mp->curmsg, unseen)) {
-			case SCNMSG:
-			case SCNERR:
+		/*
+		** Check if message is in any sequence given
+		** by Unseen-Sequence profile entry.
+		*/
+		unseen = 0;
+		for (i = 0; i < num_unseen_seq; i++) {
+			if (in_sequence(mp, seqnum[i], msgnum)) {
+				unseen = 1;
 				break;
+			}
+		}
 
-			default:
-				adios(EX_SOFTWARE, NULL, "scan() botch(%d)", state);
+		switch (state = scan(in, msgnum, SCN_FOLD, fmtstr,
+				width, msgnum==mp->curmsg, unseen)) {
+		case SCNMSG:
+		case SCNERR:
+			break;
 
-			case SCNEOF:
-				advise(NULL, "message %d: empty", msgnum);
-				break;
-			}
-			fclose(in);
+		default:
+			adios(EX_SOFTWARE, NULL, "scan() botch(%d)", state);
+
+		case SCNEOF:
+			advise(NULL, "message %d: empty", msgnum);
+			break;
 		}
+		fclose(in);
 	}
-
-	folder_free(mp);  /* free folder/message structure */
+	folder_free(mp);
 
 	return 0;
 }