Removed the -clear switch from mhl.

[mmh] / uip / mhl.c

diff --git a/uip/mhl.c b/uip/mhl.c
index ef5f860..e778fc3 100644 (file)
--- a/uip/mhl.c
+++ b/uip/mhl.c
@@ -41,37 +41,33 @@
 #define QUOTE  '\\'
 
 static struct swit mhlswitches[] = {
-#define CLRSW  0
-       { "clear", 0 },
-#define NCLRSW  1
-       { "noclear", 0 },
-#define FOLDSW  2
+#define FOLDSW  0
        { "folder +folder", 0 },
-#define FORMSW  3
+#define FORMSW  1
        { "form formfile", 0 },
-#define PROGSW  4
+#define PROGSW  2
        { "moreproc program", 0 },
-#define LENSW  5
+#define LENSW  3
        { "length lines", 0 },
-#define WIDTHSW  6
+#define WIDTHSW  4
        { "width columns", 0 },
-#define SLEEPSW  7
+#define SLEEPSW  5
        { "sleep seconds",  0 },
-#define VERSIONSW  8
+#define VERSIONSW  6
        { "version", 0 },
-#define HELPSW  9
+#define HELPSW  7
        { "help", 0 },
-#define FORW1SW  10
+#define FORW1SW  8
        { "forward", -7 },
-#define FORW2SW  11
+#define FORW2SW  9
        { "forwall", -7 },
-#define DGSTSW  12
+#define DGSTSW  10
        { "digest list", -6 },
-#define VOLUMSW  13
+#define VOLUMSW  11
        { "volume number", -6 },
-#define ISSUESW  14
+#define ISSUESW  12
        { "issue number", -5 },
-#define NBODYSW  15
+#define NBODYSW  13
        { "nobody", -6 },
        { NULL, 0 }
 };
@@ -82,16 +78,15 @@ static struct swit mhlswitches[] = {
 #define CLEARTEXT   0x000008  /* cleartext                   */
 #define EXTRA       0x000010  /* an "extra" component        */
 #define HDROUTPUT   0x000020  /* already output              */
-#define CLEARSCR    0x000040  /* clear screen                */
-#define LEFTADJUST  0x000080  /* left justify multiple lines */
-#define COMPRESS    0x000100  /* compress text               */
-#define ADDRFMT     0x000200  /* contains addresses          */
-#define DATEFMT     0x000400  /* contains dates              */
-#define FORMAT      0x000800  /* parse address/date/RFC-2047 field */
-#define INIT        0x001000  /* initialize component        */
-#define SPLIT       0x002000  /* split headers (don't concatenate) */
-#define NONEWLINE   0x004000  /* don't write trailing newline */
-#define LBITS       "\020\01NOCOMPONENT\02UPPERCASE\03CENTER\04CLEARTEXT\05EXTRA\06HDROUTPUT\07CLEARSCR\010LEFTADJUST\011COMPRESS\012ADDRFMT\013DATEFMT\014FORMAT\015INIT\016SPLIT\017NONEWLINE"
+#define LEFTADJUST  0x000040  /* left justify multiple lines */
+#define COMPRESS    0x000080  /* compress text               */
+#define ADDRFMT     0x000100  /* contains addresses          */
+#define DATEFMT     0x000200  /* contains dates              */
+#define FORMAT      0x000400  /* parse address/date/RFC-2047 field */
+#define INIT        0x000800  /* initialize component        */
+#define SPLIT       0x001000  /* split headers (don't concatenate) */
+#define NONEWLINE   0x002000  /* don't write trailing newline */
+#define LBITS       "\020\01NOCOMPONENT\02UPPERCASE\03CENTER\04CLEARTEXT\05EXTRA\06HDROUTPUT\07LEFTADJUST\010COMPRESS\011ADDRFMT\012DATEFMT\013FORMAT\014INIT\015SPLIT\016NONEWLINE"
 #define GFLAGS      (NOCOMPONENT | UPPERCASE | CENTER | LEFTADJUST | COMPRESS | SPLIT)
 
 struct mcomp {
@@ -157,9 +152,6 @@ static struct triple triples[] = {
        { "nouppercase", 0, UPPERCASE },
        { "center", CENTER, 0 },
        { "nocenter", 0, CENTER },
-       { "clearscreen", CLEARSCR, 0 },
-       { "noclearscreen", 0, CLEARSCR },
-       { "noclear", 0, CLEARSCR },
        { "leftadjust", LEFTADJUST, 0 },
        { "noleftadjust", 0, LEFTADJUST },
        { "compress", COMPRESS, 0 },
@@ -174,7 +166,6 @@ static struct triple triples[] = {
 };
 
 
-static int clearflg  = 0;
 static int dobody    = 1;
 static int forwflg   = 0;
 static int forwall   = 0;
@@ -256,7 +247,6 @@ static void m_popen(char *);
 
 void m_pclose(void);
 
-void clear_screen(void);  /* from termsbr.c */
 int SOprintf(char *, ...);  /* from termsbr.c */
 int sc_width(void);  /* from termsbr.c */
 int sc_length(void);  /* from termsbr.c */
@@ -304,13 +294,6 @@ main(int argc, char **argv)
                                print_version(invo_name);
                                done(1);
 
-                       case CLRSW:
-                               clearflg = 1;
-                               continue;
-                       case NCLRSW:
-                               clearflg = -1;
-                               continue;
-
                        case FOLDSW:
                                if (!(folder = *argp++) || *folder == '-')
                                        adios(NULL, "missing argument to %s",
@@ -379,7 +362,6 @@ main(int argc, char **argv)
                                forwall++;  /* fall */
                        case FORW1SW:
                                forwflg++;
-                               clearflg = -1;/* XXX */
                                continue;
 
                        case NBODYSW:
@@ -439,9 +421,6 @@ main(int argc, char **argv)
                adios("output", "error writing");
        }
 
-       if (clearflg > 0 && ontty == NOTTY)
-               clear_screen();
-
        if (ontty == PITTY)
                m_pclose();
 
@@ -582,13 +561,6 @@ mhl_format(char *file, int length, int width)
        }
 
 out:
-       if (clearflg == 1) {
-               global.c_flags |= CLEARSCR;
-       } else {
-               if (clearflg == -1)
-                       global.c_flags &= ~CLEARSCR;
-       }
-
        if (length)
                global.c_length = length;
        if (width)
@@ -796,31 +768,11 @@ mhlfile(FILE *fp, char *mname, int ofilen, int ofilec)
                                printf(" Message %d", ofilen);
                        printf("\n\n");
                }
-       } else {
-               switch (ontty) {
-               case PITTY:
-                       if (ofilec > 1) {
-                               if (ofilen > 1) {
-                                       if ((global.c_flags & CLEARSCR))
-                                               clear_screen();
-                                       else
-                                               printf("\n\n\n");
-                               }
-                               printf(">>> %s\n\n", mname);
-                       }
-                       break;
-
-               default:
-                       if (ofilec > 1) {
-                               if (ofilen > 1) {
-                                       printf("\n\n\n");
-                                       if (clearflg > 0)
-                                               clear_screen();
-                               }
-                               printf(">>> %s\n\n", mname);
-                       }
-                       break;
+       } else if (ofilec > 1) {
+               if (ofilen > 1) {
+                       printf("\n\n\n");
                }
+               printf(">>> %s\n\n", mname);
        }
 
        for (state = FLD;;) {
@@ -1285,8 +1237,6 @@ putch(char ch)
                buf[0] = 0;
                read(fileno(stdout), buf, sizeof(buf));
                if (strchr(buf, '\n')) {
-                       if (global.c_flags & CLEARSCR)
-                               clear_screen();
                        row = 0;
                } else {
                        putchar('\n');