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

[mmh] / uip / folder.c

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" : "");
        }