replsbr.c: In parent, free child's argv[] built before fork().

[nmh] / uip / mhstore.c

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 850cabe07d52694e3a490669c6b4c3b132c22944..b8feba96ecdf0ccf5eeed27635533aaf1613960f 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -31,6 +31,7 @@
     X("part number", 0, PARTSW) \
     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) \
@@ -47,23 +48,10 @@ DEFINE_SWITCH_ARRAY(MHSTORE, switches);
 #undef X
 
 
-/* mhmisc.c */
-extern int npart;
-extern int ntype;
-extern char *parts[NPARTS + 1];
-extern char *types[NTYPES + 1];
-extern int userrs;
-
-/* mhparse.c */
-extern char *preferred_types[];
-extern  char *preferred_subtypes[];
-extern int npreferred;
-
 #define        quitser pipeser
 
 /* mhparse.c */
 int debugsw = 0;
-CT parse_mime (char *);
 
 /*
  * static prototypes
@@ -179,6 +167,10 @@ do_cache:
                preferred_subtypes[npreferred++] = cp;
                continue;
 
+           case NPREFERSW:
+               npreferred = 0;
+               continue;
+
            case FILESW:
                if (!(cp = *argp++) || (*cp == '-' && cp[1]))
                    adios (NULL, "missing argument to %s", argp[-2]);
@@ -224,7 +216,7 @@ do_cache:
      */
     if ((cp = getenv ("MHSTORE"))) {
        if ((fp = fopen (cp, "r"))) {
-           readconfig ((struct node **) 0, fp, cp, 0);
+           readconfig(NULL, fp, cp, 0);
            fclose (fp);
        } else {
            admonish ("", "unable to read $MHSTORE profile (%s)", cp);
@@ -235,7 +227,7 @@ do_cache:
      * Read the standard profile setup
      */
     if ((fp = fopen (cp = etcpath ("mhn.defaults"), "r"))) {
-       readconfig ((struct node **) 0, fp, cp, 0);
+       readconfig(NULL, fp, cp, 0);
        fclose (fp);
     }