Removed the -clear switch from scan(1).

[mmh] / uip / scan.c

diff --git a/uip/scan.c b/uip/scan.c
index d228c71..1b58eb5 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -14,41 +14,29 @@
 #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 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;
@@ -85,24 +73,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:
@@ -133,7 +107,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
@@ -257,8 +231,6 @@ main(int argc, char **argv)
        }
 
        folder_free(mp);  /* free folder/message structure */
-       if (clearflag)
-               clear_screen();
 
        done(0);
        return 1;