mhlist: Always display the column header (removed -headers).

diff --git a/man/mhlist.man1 b/man/mhlist.man1
index 1936959..a94a7df 100644 (file)
--- a/man/mhlist.man1
+++ b/man/mhlist.man1
@@ -18,7 +18,6 @@ mhlist \- list information about MIME messages
 .RB [ \-type
 .IR content ]
 \&...
 .RB [ \-type
 .IR content ]
 \&...

-.RB [ \-headers " | " \-noheaders ]

 .RB [ \-verbose " | " \-noverbose ]
 .RB [ \-version ]
 .RB [ \-help ]
 .RB [ \-verbose " | " \-noverbose ]
 .RB [ \-version ]
 .RB [ \-help ]

@@ -35,10 +34,7 @@ manipulates MIME (multi-media messages) as specified
 in RFC\-2045 thru RFC\-2049 (See
 .BR mhbuild (1)).
 .PP
 in RFC\-2045 thru RFC\-2049 (See
 .BR mhbuild (1)).
 .PP

-The
-.B \-headers
-switch indicates that a one-line banner should be
-displayed above the listing.
+A one-line banner is displayed above the listing.

 The size of the
 \*(lqnative\*(rq (decoded) format of each content is evaluated.
 This provides an accurate count at the expense of a small delay.
 The size of the
 \*(lqnative\*(rq (decoded) format of each content is evaluated.
 This provides an accurate count at the expense of a small delay.

@@ -146,7 +142,6 @@ mhbuild(1), show(1), mhstore(1), sendfiles(1)
 .nf
 .RB ` +folder "' defaults to the current folder"
 .RB ` msgs "' defaults to cur"
 .nf
 .RB ` +folder "' defaults to the current folder"
 .RB ` msgs "' defaults to cur"

-.RB ` \-headers '

 .RB ` \-noverbose '
 .fi
 
 .RB ` \-noverbose '
 .fi
 

diff --git a/uip/mhlist.c b/uip/mhlist.c
index 685c8ff..dd954a0 100644 (file)
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -17,25 +17,21 @@
 #include <h/utils.h>
 
 static struct swit switches[] = {
 #include <h/utils.h>
 
 static struct swit switches[] = {

-#define HEADSW  0
-       { "headers", 0 },
-#define NHEADSW  1
-       { "noheaders", 0 },
-#define VERBSW  2
+#define VERBSW  0

        { "verbose", 0 },
        { "verbose", 0 },

-#define NVERBSW  3
+#define NVERBSW  1

        { "noverbose", 0 },
        { "noverbose", 0 },

-#define FILESW  4  /* interface from show */
+#define FILESW  2  /* interface from show */

        { "file file", 0 },
        { "file file", 0 },

-#define PARTSW  5
+#define PARTSW  3

        { "part number", 0 },
        { "part number", 0 },

-#define TYPESW  6
+#define TYPESW  4

        { "type content", 0 },
        { "type content", 0 },

-#define VERSIONSW  7
+#define VERSIONSW  5

        { "version", 0 },
        { "version", 0 },

-#define HELPSW  8
+#define HELPSW  6

        { "help", 0 },
        { "help", 0 },

-#define DEBUGSW  9
+#define DEBUGSW  7

        { "debug", -5 },
        { NULL, 0 }
 };
        { "debug", -5 },
        { NULL, 0 }
 };

@@ -72,7 +68,7 @@ void set_endian(void);
 void flush_errors(void);
 
 /* mhlistsbr.c */
 void flush_errors(void);
 
 /* mhlistsbr.c */

-void list_all_messages(CT *, int, int, int);
+void list_all_messages(CT *, int, int);

 
 /* mhfree.c */
 void free_content(CT);
 
 /* mhfree.c */
 void free_content(CT);

@@ -88,7 +84,6 @@ static void pipeser(int);
 int
 main(int argc, char **argv)
 {
 int
 main(int argc, char **argv)
 {

-       int headsw = 1;

        int msgnum;
        char *cp, *file = NULL, *folder = NULL;
        char *maildir, buf[100], **argp;
        int msgnum;
        char *cp, *file = NULL, *folder = NULL;
        char *maildir, buf[100], **argp;

@@ -130,13 +125,6 @@ main(int argc, char **argv)
                                print_version(invo_name);
                                done(1);
 
                                print_version(invo_name);
                                done(1);
 

-                       case HEADSW:
-                               headsw = 1;
-                               continue;
-                       case NHEADSW:
-                               headsw = 0;
-                               continue;
-

                        case PARTSW:
                                if (!(cp = *argp++) || *cp == '-')
                                        adios(NULL, "missing argument to %s",
                        case PARTSW:
                                if (!(cp = *argp++) || *cp == '-')
                                        adios(NULL, "missing argument to %s",

@@ -279,7 +267,7 @@ main(int argc, char **argv)
        /*
        ** List the message content
        */
        /*
        ** List the message content
        */

-       list_all_messages(cts, headsw, verbosw, debugsw);
+       list_all_messages(cts, verbosw, debugsw);

 
        /* Now free all the structures for the content */
        for (ctp = cts; *ctp; ctp++)
 
        /* Now free all the structures for the content */
        for (ctp = cts; *ctp; ctp++)

diff --git a/uip/mhlistsbr.c b/uip/mhlistsbr.c
index c2db987..dc85bcc 100644 (file)
--- a/uip/mhlistsbr.c
+++ b/uip/mhlistsbr.c
@@ -25,7 +25,7 @@ void flush_errors(void);
 /*
 ** prototypes
 */
 /*
 ** prototypes
 */

-void list_all_messages(CT *, int, int, int);
+void list_all_messages(CT *, int, int);

 int list_switch(CT, int, int, int);
 int list_content(CT, int, int, int);
 
 int list_switch(CT, int, int, int);
 int list_content(CT, int, int, int);
 

@@ -57,19 +57,15 @@ static int list_encoding(CT);
 ** Top level entry point to list group of messages
 */
 void
 ** Top level entry point to list group of messages
 */
 void

-list_all_messages(CT *cts, int headers, int verbose, int debug)
+list_all_messages(CT *cts, int verbose, int debug)

 {
        CT ct, *ctp;
 
 {
        CT ct, *ctp;
 

-       if (headers)
-               printf(LSTFMT1, "msg", "part", "type/subtype", "size",
-                               "description");
-
+       printf(LSTFMT1, "msg", "part", "type/subtype", "size", "description");

        for (ctp = cts; *ctp; ctp++) {
                ct = *ctp;
                list_single_message(ct, verbose, debug);
        }
        for (ctp = cts; *ctp; ctp++) {
                ct = *ctp;
                list_single_message(ct, verbose, debug);
        }

-

        flush_errors();
 }
 
        flush_errors();
 }