Removed (allmost all) JLR-specific code.

[mmh] / uip / scan.c

diff --git a/uip/scan.c b/uip/scan.c
index 478e4a6..cb4bac4 100644 (file)
--- 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,
@@ -252,34 +239,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,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;
@@ -318,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();