Removed RFC 1864 (Content-MD5) support. I.e. -check switches.

[mmh] / uip / mhstore.c

diff --git a/uip/mhstore.c b/uip/mhstore.c
index e510d13..950483b 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -9,7 +9,6 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/signals.h>
-#include <h/md5.h>
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.h>
@@ -24,33 +23,21 @@ static struct swit switches[] = {
        { "auto", 0 },
 #define NAUTOSW  1
        { "noauto", 0 },
-#define CHECKSW  2
-       { "check", 0 },
-#define NCHECKSW  3
-       { "nocheck", 0 },
-#define VERBSW  4
-       { "verbose", 0 },
-#define NVERBSW  5
-       { "noverbose", 0 },
-#define FILESW  6  /* interface from show */
+#define FILESW  2  /* interface from show */
        { "file file", 0 },
-#define PARTSW  7
+#define PARTSW  3
        { "part number", 0 },
-#define TYPESW  8
+#define TYPESW  4
        { "type content", 0 },
-#define RCACHESW  9
+#define RCACHESW  5
        { "rcache policy", 0 },
-#define WCACHESW  10
+#define WCACHESW  6
        { "wcache policy", 0 },
-#define VERSIONSW  11
+#define VERSIONSW  7
        { "version", 0 },
-#define HELPSW  12
+#define HELPSW  8
        { "help", 0 },
-
-/*
-** switches for debugging
-*/
-#define DEBUGSW  13
+#define DEBUGSW  9
        { "debug", -5 },
        { NULL, 0 }
 };
@@ -73,7 +60,6 @@ extern char *types[NTYPES + 1];
 extern int userrs;
 
 int debugsw = 0;
-int verbosw = 0;
 
 #define quitser pipeser
 
@@ -123,7 +109,7 @@ int make_intermediates(char *);
 void flush_errors(void);
 
 /* mhshowsbr.c */
-int show_content_aux(CT, int, int, char *, char *);
+int show_content_aux(CT, int, char *, char *);
 
 /*
 ** static prototypes
@@ -217,13 +203,6 @@ do_cache:
                                }
                                continue;
 
-                       case CHECKSW:
-                               checksw++;
-                               continue;
-                       case NCHECKSW:
-                               checksw = 0;
-                               continue;
-
                        case PARTSW:
                                if (!(cp = *argp++) || *cp == '-')
                                        adios(NULL, "missing argument to %s",
@@ -249,12 +228,6 @@ do_cache:
                                file = *cp == '-' ? cp : getcpy(expanddir(cp));
                                continue;
 
-                       case VERBSW:
-                               verbosw = 1;
-                               continue;
-                       case NVERBSW:
-                               verbosw = 0;
-                               continue;
                        case DEBUGSW:
                                debugsw = 1;
                                continue;
@@ -453,7 +426,7 @@ store_all_messages(CT *cts)
        */
        if (autosw)
                dir = getcpy(cwd);
-       else if ((cp = context_find(nmhstorage)) && *cp)
+       if ((cp = context_find(nmhstorage)) && *cp)
                dir = getcpy(cp);
        else
                dir = getcpy(cwd);
@@ -939,7 +912,7 @@ store_content(CT ct, CT p)
        ** content to standard input of a command and return.
        */
        if (buffer[0] == '|' || buffer[0] == '!')
-               return show_content_aux(ct, 1, 0, buffer + 1, dir);
+               return show_content_aux(ct, 0, buffer + 1, dir);
 
        /* record the filename */
        ct->c_storage = getcpy(buffer);