Removed support for Encrypted: headers, which were removed in RFC 2822.

[mmh] / uip / scan.c

diff --git a/uip/scan.c b/uip/scan.c
index cfcd3e4..1520553 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -14,34 +14,23 @@
 #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 WIDTHSW  3
+#define WIDTHSW  1
        { "width columns", 0 },
-#define FILESW  4
+#define FILESW  2
        { "file file", 4 },
-#define VERSIONSW 5
+#define VERSIONSW 3
        { "version", 0 },
-#define HELPSW  6
+#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;
@@ -83,13 +72,6 @@ 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",
@@ -147,7 +129,7 @@ main(int argc, char **argv)
                for (msgnum = 1; ; ++msgnum) {
                        state = scan(in, msgnum, -1, nfs, width, 0, 0,
                                        NULL, 0L, 1);
-                       if (state != SCNMSG && state != SCNENC)
+                       if (state != SCNMSG)
                                break;
                }
                fclose(in);
@@ -205,8 +187,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) {
@@ -230,7 +210,6 @@ main(int argc, char **argv)
                                                msgnum == mp->curmsg, unseen,
                                                folder, 0L, 1)) {
                        case SCNMSG:
-                       case SCNENC:
                        case SCNERR:
                                break;
 
@@ -242,14 +221,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;