Removed the -header option from scan(1).

[mmh] / uip / scan.c

diff --git a/uip/scan.c b/uip/scan.c
index cb4bac4..e5fb55a 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -23,21 +23,17 @@ static struct swit switches[] = {
        { "form formatfile", 0 },
 #define FMTSW  3
        { "format string", 5 },
-#define HEADSW  4
-       { "header", 0 },
-#define NHEADSW  5
-       { "noheader", 0 },
-#define WIDTHSW  6
+#define WIDTHSW  4
        { "width columns", 0 },
-#define REVSW  7
+#define REVSW  5
        { "reverse", 0 },
-#define NREVSW  8
+#define NREVSW  6
        { "noreverse", 0 },
-#define FILESW  9
+#define FILESW  7
        { "file file", 4 },
-#define VERSIONSW 10
+#define VERSIONSW 8
        { "version", 0 },
-#define HELPSW  11
+#define HELPSW  9
        { "help", 0 },
        { NULL, 0 }
 };
@@ -52,7 +48,7 @@ void clear_screen(void);  /* from termsbr.c */
 int
 main(int argc, char **argv)
 {
-       int clearflag = 0, hdrflag = 0, ontty;
+       int clearflag = 0, ontty;
        int width = 0, revflag = 0;
        int i, state, msgnum;
        int seqnum[NUMATTRS], unseen, num_unseen_seq = 0;
@@ -115,13 +111,6 @@ main(int argc, char **argv)
                                form = NULL;
                                continue;
 
-                       case HEADSW:
-                               hdrflag++;
-                               continue;
-                       case NHEADSW:
-                               hdrflag = 0;
-                               continue;
-
                        case WIDTHSW:
                                if (!(cp = *argp++) || *cp == '-')
                                        adios(NULL, "missing argument to %s",
@@ -178,7 +167,7 @@ main(int argc, char **argv)
                m_unknown(in);
                for (msgnum = 1; ; ++msgnum) {
                        state = scan(in, msgnum, -1, nfs, width, 0, 0,
-                                       hdrflag ? file : NULL, 0L, 1);
+                                       NULL, 0L, 1);
                        if (state != SCNMSG && state != SCNENC)
                                break;
                }
@@ -275,7 +264,6 @@ main(int argc, char **argv)
                                advise(NULL, "message %d: empty", msgnum);
                                break;
                        }
-                       hdrflag = 0;
                        fclose(in);
                        if (ontty)
                                fflush(stdout);