Remove caching of external MIME parts.

[mmh] / uip / mhstore.c

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 950483b..ed36c96 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -15,7 +15,6 @@
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
-#include <h/mhcachesbr.h>
 #include <h/utils.h>
 
 static struct swit switches[] = {
@@ -29,15 +28,11 @@ static struct swit switches[] = {
        { "part number", 0 },
 #define TYPESW  4
        { "type content", 0 },
-#define RCACHESW  5
-       { "rcache policy", 0 },
-#define WCACHESW  6
-       { "wcache policy", 0 },
-#define VERSIONSW  7
+#define VERSIONSW  5
        { "version", 0 },
-#define HELPSW  8
+#define HELPSW  6
        { "help", 0 },
-#define DEBUGSW  9
+#define DEBUGSW  7
        { "debug", -5 },
        { NULL, 0 }
 };
@@ -46,12 +41,6 @@ static struct swit switches[] = {
 /* mhparse.c */
 extern char *tmp;  /* directory to place temp files */
 
-/* mhcachesbr.c */
-extern int rcachesw;
-extern int wcachesw;
-extern char *cache_public;
-extern char *cache_private;
-
 /* mhmisc.c */
 extern int npart;
 extern int ntype;
@@ -134,7 +123,7 @@ static void store_all_messages(CT *);
 int
 main(int argc, char **argv)
 {
-       int msgnum, *icachesw;
+       int msgnum;
        char *cp, *file = NULL, *folder = NULL;
        char *maildir, buf[100], **argp;
        char **arguments;
@@ -183,26 +172,6 @@ main(int argc, char **argv)
                                autosw = 0;
                                continue;
 
-                       case RCACHESW:
-                               icachesw = &rcachesw;
-                               goto do_cache;
-                       case WCACHESW:
-                               icachesw = &wcachesw;
-do_cache:
-                               if (!(cp = *argp++) || *cp == '-')
-                                       adios(NULL, "missing argument to %s",
-                                                       argp[-2]);
-                               switch (*icachesw = smatch(cp, caches)) {
-                               case AMBIGSW:
-                                       ambigsw(cp, caches);
-                                       done(1);
-                               case UNKWNSW:
-                                       adios(NULL, "%s unknown", cp);
-                               default:
-                                       break;
-                               }
-                               continue;
-
                        case PARTSW:
                                if (!(cp = *argp++) || *cp == '-')
                                        adios(NULL, "missing argument to %s",
@@ -269,15 +238,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 = getcpy(toabsdir(cache_private));
-
        /*
        ** Cache the current directory before we do any chdirs()'s.
        */