X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8bd6112f573f6b9e8cc9b93d01a594748a2ef8fb..085bca07c0b505f095a50666a3752e5fcb69bc70:/uip/mhshow.c

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 8bfdcb52..130b646d 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -6,6 +6,12 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_name.h"
+#include "sbr/m_gmprot.h"
+#include "sbr/getarguments.h"
+#include "sbr/seq_setunseen.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"
@@ -22,13 +28,11 @@
 #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/fmt_scan.h"
 #include "h/mime.h"
 #include "h/mhparse.h"
-#include "h/mhcachesbr.h"
 #include "h/done.h"
 #include "h/utils.h"
 #include "mhmisc.h"
@@ -58,8 +62,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("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
     /*					\
@@ -97,7 +99,7 @@ static void pipeser (int);
 int
 main (int argc, char **argv)
 {
-    int msgnum, *icachesw, concatsw = -1, textonly = -1, inlineonly = -1;
+    int msgnum, concatsw = -1, textonly = -1, inlineonly = -1;
     char *cp, *file = NULL;
     char *maildir, buf[100], **argp;
     char **arguments;
@@ -134,30 +136,9 @@ 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 CONCATSW:
@@ -315,15 +296,6 @@ do_cache:
 	fclose (fp);
     }
 
-    /* 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));