Removed special `folder' and `dtimenow' format escapes from scan listings.

[mmh] / uip / scan.c

diff --git a/uip/scan.c b/uip/scan.c
index a11ca0d..ef13e39 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -10,46 +10,32 @@
 #include <h/fmt_scan.h>
 #include <h/scansbr.h>
 #include <h/tws.h>
-#include <h/mts.h>
 #include <h/utils.h>
 #include <errno.h>
 
 static struct swit switches[] = {
-#define CLRSW  0
-       { "clear", 0 },
-#define NCLRSW  1
-       { "noclear", 0 },
-#define FORMSW  2
+#define FORMSW  0
        { "form formatfile", 0 },
-#define FMTSW  3
-       { "format string", 5 },
-#define WIDTHSW  4
+#define WIDTHSW  1
        { "width columns", 0 },
-#define FILESW  5
+#define FILESW  2
        { "file file", 4 },
-#define VERSIONSW 6
+#define VERSIONSW 3
        { "version", 0 },
-#define HELPSW  7
+#define HELPSW  4
        { "help", 0 },
        { NULL, 0 }
 };
 
 
-/*
-** prototypes
-*/
-void clear_screen(void);  /* from termsbr.c */
-
-
 int
 main(int argc, char **argv)
 {
-       int clearflag = 0, ontty;
        int width = 0;
        int i, state, msgnum;
        int seqnum[NUMATTRS], unseen, num_unseen_seq = 0;
        char *cp, *maildir, *file = NULL, *folder = NULL;
-       char *form = NULL, *format = NULL, buf[BUFSIZ];
+       char *form = NULL, buf[BUFSIZ];
        char **argp, *nfs, **arguments;
        struct msgs_array msgs = { 0, 0, NULL };
        struct msgs *mp;
@@ -63,7 +49,6 @@ main(int argc, char **argv)
        /* read user profile/context */
        context_read();
 
-       mts_init(invo_name);
        arguments = getarguments(invo_name, argc, argv, 1);
        argp = arguments;
 
@@ -87,24 +72,10 @@ main(int argc, char **argv)
                                print_version(invo_name);
                                done(1);
 
-                       case CLRSW:
-                               clearflag++;
-                               continue;
-                       case NCLRSW:
-                               clearflag = 0;
-                               continue;
-
                        case FORMSW:
                                if (!(form = *argp++) || *form == '-')
                                        adios(NULL, "missing argument to %s",
                                                        argp[-2]);
-                               format = NULL;
-                               continue;
-                       case FMTSW:
-                               if (!(format = *argp++) || *format == '-')
-                                       adios(NULL, "missing argument to %s",
-                                                       argp[-2]);
-                               form = NULL;
                                continue;
 
                        case WIDTHSW:
@@ -135,7 +106,7 @@ main(int argc, char **argv)
        /*
        ** Get new format string.  Must be before chdir().
        */
-       nfs = new_fs(form, format, FORMAT);
+       nfs = new_fs(form, FORMAT);
 
        /*
        ** We are scanning a maildrop file
@@ -156,9 +127,8 @@ main(int argc, char **argv)
 
                m_unknown(in);
                for (msgnum = 1; ; ++msgnum) {
-                       state = scan(in, msgnum, -1, nfs, width, 0, 0,
-                                       NULL, 0L, 1);
-                       if (state != SCNMSG && state != SCNENC)
+                       state = scan(in, msgnum, -1, nfs, width, 0, 0, 1);
+                       if (state != SCNMSG)
                                break;
                }
                fclose(in);
@@ -216,8 +186,6 @@ main(int argc, char **argv)
                }
        }
 
-       ontty = isatty(fileno(stdout));
-
        for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
                if (is_selected(mp, msgnum)) {
                        if ((in = fopen(cp = m_name(msgnum), "r")) == NULL) {
@@ -239,9 +207,8 @@ main(int argc, char **argv)
 
                        switch (state = scan(in, msgnum, 0, nfs, width,
                                                msgnum == mp->curmsg, unseen,
-                                               folder, 0L, 1)) {
+                                               1)) {
                        case SCNMSG:
-                       case SCNENC:
                        case SCNERR:
                                break;
 
@@ -253,14 +220,10 @@ main(int argc, char **argv)
                                break;
                        }
                        fclose(in);
-                       if (ontty)
-                               fflush(stdout);
                }
        }
 
        folder_free(mp);  /* free folder/message structure */
-       if (clearflag)
-               clear_screen();
 
        done(0);
        return 1;