folder: Never display column headers (removed -header).

Also removed the full-stop (dot) at the end of each line. It looked rather
strange to have it there.

diff --git a/man/folder.man1 b/man/folder.man1
index 4858486..e162a8e 100644 (file)
--- a/man/folder.man1
+++ b/man/folder.man1
@@ -13,7 +13,6 @@ folder, folders \- set/list current folder/message
 .RB [ \-all " | " \-noall ]
 .RB [ \-create " | " \-nocreate ]
 .RB [ \-fast " | " \-nofast ]
-.RB [ \-header " | " \-noheader ]
 .RB [ \-recurse " | " \-norecurse ]
 .RB [ \-total " | " \-nototal ]
 .RB [ \-list " | " \-nolist ]
@@ -48,7 +47,7 @@ they exist.  An example of this summary is:
 .RS 5
 .nf
 .ta \w'/rnd/phyl/Mail/EP 'u +\w'has ddd messages 'u +\w'(ddd\-ddd); 'u
-inbox+ has \016 messages       (\0\03\-\022);  cur=\0\05.
+inbox+ has \016 messages       (\0\03\-\022);  cur=\0\05
 .fi
 .RE
 .PP
@@ -114,13 +113,13 @@ context.  For example:
 .nf
 .ta \w'/rnd/phyl/Mail/EP 'u +\w'has ddd messages 'u +\w'(ddd\-ddd); 'u
 FOLDER \0\0\0\0\0\0# MESSAGES  RANGE   CUR     (OTHERS)
-/var/work/folder       has \035 messages       (\01\-\035);    cur=23.
-/usr/bugs/Mail has \082 messages       (\01\-108);     cur=82.
-ff     has \0no messages.
-inbox+ has \016 messages       (\03\-\022);    cur=\05.
-mh     has \076 messages       (15\-\076);     cur=70.
-notes  has \0\02 messages      (\01\-\0\02);   cur=\01.
-ucom   has 124 messages        (\01\-124);     cur=\06; (others).
+/var/work/folder       has \035 messages       (\01\-\035);    cur=23
+/usr/bugs/Mail has \082 messages       (\01\-108);     cur=82
+ff     has \0no messages
+inbox+ has \016 messages       (\03\-\022);    cur=\05
+mh     has \076 messages       (15\-\076);     cur=70
+notes  has \0\02 messages      (\01\-\0\02);   cur=\01
+ucom   has 124 messages        (\01\-124);     cur=\06; (others)
 .ta \w'/rnd/phyl/Mail/EP has 'u
 
 TOTAL = 339 messages in 7 folders
@@ -136,13 +135,6 @@ has files which
 aren't messages.  These files may either be sub\-folders, or files that
 don't belong under the nmh file naming scheme.
 .PP
-The header is output if either a
-.B \-all
-or a
-.B \-header
-switch is specified.  It is suppressed by
-.BR \-noheader .
-.PP
 The folder and message totals are output if either a
 .B \-all
 or a
@@ -291,7 +283,6 @@ refile(1), mhpath(1)
 .RB ` +folder "' defaults to the current folder"
 .RB ` msg "' defaults to none"
 .RB ` \-nofast '
-.RB ` \-noheader '
 .RB ` \-nototal '
 .RB ` \-nopack '
 .RB ` \-norecurse '

diff --git a/uip/folder.c b/uip/folder.c
index 616f57b..cc40059 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -26,41 +26,37 @@ static struct swit switches[] = {
        { "fast", 0 },
 #define NFASTSW  5
        { "nofast", 0 },
-#define HDRSW  6
-       { "header", 0 },
-#define NHDRSW  7
-       { "noheader", 0 },
-#define PACKSW  8
+#define PACKSW  6
        { "pack", 0 },
-#define NPACKSW  9
+#define NPACKSW  7
        { "nopack", 0 },
-#define VERBSW  10
+#define VERBSW  8
        { "verbose", 0 },
-#define NVERBSW  11
+#define NVERBSW  9
        { "noverbose", 0 },
-#define RECURSW  12
+#define RECURSW  10
        { "recurse", 0 },
-#define NRECRSW  13
+#define NRECRSW  11
        { "norecurse", 0 },
-#define TOTALSW  14
+#define TOTALSW  12
        { "total", 0 },
-#define NTOTLSW  15
+#define NTOTLSW  13
        { "nototal", 0 },
-#define LISTSW  16
+#define LISTSW  14
        { "list", 0 },
-#define NLISTSW  17
+#define NLISTSW  15
        { "nolist", 0 },
-#define PRNTSW  18
+#define PRNTSW  16
        { "print", 0 },
-#define NPRNTSW  19
+#define NPRNTSW  17
        { "noprint", -4 },
-#define PUSHSW  20
+#define PUSHSW  18
        { "push", 0 },
-#define POPSW  21
+#define POPSW  19
        { "pop", 0 },
-#define VERSIONSW  22
+#define VERSIONSW  20
        { "version", 0 },
-#define HELPSW  23
+#define HELPSW  21
        { "help", 0 },
        { NULL, 0 }
 };
@@ -69,7 +65,6 @@ static int fshort   = 0;  /* output only folder names */
 static int fcreat   = 0;  /* should we ask to create new folders? */
 static int fpack    = 0;  /* are we packing the folder? */
 static int fverb    = 0;  /* print actions taken while packing folder */
-static int fheader  = 0;  /* should we output a header? */
 static int frecurse = 0;  /* recurse through subfolders */
 static int ftotal   = 0;  /* should we output the totals? */
 static int all      = 0;  /* should we output all folders */
@@ -177,13 +172,6 @@ main(int argc, char **argv)
                                fshort = 0;
                                continue;
 
-                       case HDRSW:
-                               fheader = 1;
-                               continue;
-                       case NHDRSW:
-                               fheader = -1;
-                               continue;
-
                        case PACKSW:
                                fpack++;
                                continue;
@@ -544,17 +532,6 @@ print_folders(void)
                nummsgdigits = 2;
 
        /*
-       ** Print the header
-       */
-       if (fheader > 0 || (all && !fshort && fheader >= 0))
-               printf("%-*s %*s %-*s; %-*s %*s\n",
-                               maxlen+1, "FOLDER",
-                               nummsgdigits + 13, "# MESSAGES",
-                               lowmsgdigits + hghmsgdigits + 4, " RANGE",
-                               curmsgdigits + 4, "CUR",
-                               9, "(OTHERS)");
-
-       /*
        ** Print folder information
        */
        if (all || fshort || ftotal < 1) {
@@ -600,7 +577,7 @@ print_folders(void)
                        if (fi[i].others)
                                printf(";%*s (others)", curprinted ?
                                                0 : curmsgdigits + 6, "");
-                       printf(".\n");
+                       printf("\n");
                }
        }
 
@@ -610,7 +587,7 @@ print_folders(void)
        if (ftotal > 0 || (all && !fshort && ftotal >= 0)) {
                if (all)
                        printf("\n");
-               printf("TOTAL = %d message%c in %d folder%s.\n",
+               printf("TOTAL = %d message%c in %d folder%s\n",
                                total_msgs, total_msgs != 1 ? 's' : ' ',
                                total_folders, total_folders != 1 ? "s" : "");
        }