Fixed inc(1) and %(me) to not obey Local-Mailbox profile component.

[nmh] / uip / mhlist.c

diff --git a/uip/mhlist.c b/uip/mhlist.c
index 5b14b88a2342443dd5bd8e1ab3c0135d10903a11..a8e28cbd4030feeb4fdd5cec89c94d9f5a7de700 100644 (file)
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -5,24 +5,40 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
+#include "h/mh.h"
+#include "sbr/m_name.h"
+#include "sbr/m_gmprot.h"
+#include "sbr/getarguments.h"
+#include "sbr/seq_setprev.h"
+#include "sbr/seq_setcur.h"
+#include "sbr/seq_save.h"
+#include "sbr/smatch.h"
+#include "sbr/m_convert.h"
+#include "sbr/getfolder.h"
+#include "sbr/folder_read.h"
+#include "sbr/context_save.h"
+#include "sbr/context_replace.h"
+#include "sbr/context_find.h"
+#include "sbr/ambigsw.h"
+#include "sbr/path.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"
 #include <fcntl.h>
-#include <h/signals.h>
-#include <h/md5.h>
-#include <h/mts.h>
-#include <h/tws.h>
-#include <h/mime.h>
-#include <h/mhparse.h>
-#include <h/mhcachesbr.h>
+#include "h/signals.h"
+#include "h/mts.h"
+#include "h/tws.h"
+#include "h/mime.h"
+#include "h/mhparse.h"
 #include "h/done.h"
-#include <h/utils.h>
+#include "h/utils.h"
 #include "mhmisc.h"
 #include "sbr/m_maildir.h"
 #include "mhfree.h"
 
 #define MHLIST_SWITCHES \
-    X("check", 0, CHECKSW) \
-    X("nocheck", 0, NCHECKSW) \
+    X("check", -5, CHECKSW) \
+    X("nocheck", -7, NCHECKSW) \
     X("headers", 0, HEADSW) \
     X("noheaders", 0, NHEADSW) \
     X("realsize", 0, SIZESW) \
@@ -36,8 +52,6 @@
     X("type content", 0, TYPESW) \
     X("prefer content", 0, PREFERSW) \
     X("noprefer", 0, NPREFERSW) \
-    X("rcache policy", 0, RCACHESW) \
-    X("wcache policy", 0, WCACHESW) \
     X("changecur", 0, CHGSW) \
     X("nochangecur", 0, NCHGSW) \
     X("version", 0, VERSIONSW) \
@@ -69,8 +83,12 @@ static void pipeser (int);
 int
 main (int argc, char **argv)
 {
-    int sizesw = 1, headsw = 1, chgflag = 1, verbosw = 0, dispo = 0;
-    int msgnum, *icachesw;
+    bool sizesw = true;
+    bool headsw = true;
+    bool chgflag = true;
+    bool verbosw = false;
+    bool dispo = false;
+    int msgnum;
     char *cp, *file = NULL, *folder = NULL;
     char *maildir, buf[100], **argp;
     char **arguments;
@@ -106,44 +124,23 @@ main (int argc, char **argv)
                print_version(invo_name);
                done (0);
 
-           case RCACHESW:
-               icachesw = &rcachesw;
-               goto do_cache;
-           case WCACHESW:
-               icachesw = &wcachesw;
-do_cache:
-               if (!(cp = *argp++) || *cp == '-')
-                   die("missing argument to %s", argp[-2]);
-               switch (*icachesw = smatch (cp, cache_policy)) {
-               case AMBIGSW:
-                   ambigsw (cp, cache_policy);
-                   done (1);
-               case UNKWNSW:
-                   die("%s unknown", cp);
-               default:
-                   break;
-               }
-               continue;
-
            case CHECKSW:
-               checksw++;
-               continue;
            case NCHECKSW:
-               checksw = 0;
+               /* Currently a NOP */
                continue;
 
            case HEADSW:
-               headsw = 1;
+               headsw = true;
                continue;
            case NHEADSW:
-               headsw = 0;
+               headsw = false;
                continue;
 
            case SIZESW:
-               sizesw = 1;
+               sizesw = true;
                continue;
            case NSIZESW:
-               sizesw = 0;
+               sizesw = false;
                continue;
 
            case PARTSW:
@@ -187,23 +184,23 @@ do_cache:
                continue;
 
            case CHGSW:
-               chgflag++;
+               chgflag = true;
                continue;
            case NCHGSW:
-               chgflag = 0;
+               chgflag = false;
                continue;
 
            case VERBSW: 
-               verbosw = 1;
+               verbosw = true;
                continue;
            case NVERBSW: 
-               verbosw = 0;
+               verbosw = false;
                continue;
            case DISPOSW:
-               dispo = 1;
+               dispo = true;
                continue;
            case NDISPOSW:
-               dispo = 0;
+               dispo = false;
                continue;
            case DEBUGSW:
                debugsw = 1;
@@ -222,15 +219,6 @@ do_cache:
     parts[npart] = NULL;
     types[ntype] = NULL;
 
-    /* Check for public cache location */
-    if ((cache_public = context_find (nmhcache)) && *cache_public != '/')
-       cache_public = NULL;
-
-    /* Check for private cache location */
-    if (!(cache_private = context_find (nmhprivcache)))
-       cache_private = ".cache";
-    cache_private = mh_xstrdup(m_maildir(cache_private));
-
     if (!context_find ("path"))
        free (path ("./", TFOLDER));
 
@@ -290,7 +278,7 @@ do_cache:
     if (!*cts)
        done (1);
 
-    userrs = 1;
+    userrs = true;
     SIGNAL (SIGQUIT, quitser);
     SIGNAL (SIGPIPE, pipeser);