X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/907c9b486942fb58b0ca330131721e074075c912..63621a81d16ab743de6b57d47578a9a2c670ad22:/uip/mhstore.c

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 0c91ec47..ed6ad77f 100644
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -1,6 +1,4 @@
-
-/*
- * mhstore.c -- store the contents of MIME messages
+/* mhstore.c -- store the contents of MIME messages
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -17,6 +15,9 @@
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
+#include "mhmisc.h"
+#include "sbr/m_maildir.h"
+#include "mhfree.h"
 
 #define MHSTORE_SWITCHES \
     X("auto", 0, AUTOSW) \
@@ -29,6 +30,8 @@
     X("outfile outfile", 0, OUTFILESW) \
     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) \
@@ -45,42 +48,10 @@ DEFINE_SWITCH_ARRAY(MHSTORE, switches);
 #undef X
 
 
-/* mhcachesbr.c */
-extern int rcachesw;
-extern int wcachesw;
-extern char *cache_public;
-extern char *cache_private;
-
-/* mhstoresbr.c */
-typedef struct mhstoreinfo *mhstoreinfo_t;
-mhstoreinfo_t mhstoreinfo_create(CT *, char *, const char *, int, int);
-int mhstoreinfo_files_not_clobbered(const mhstoreinfo_t);
-void mhstoreinfo_free(mhstoreinfo_t);
-
-/* mhmisc.c */
-extern int npart;
-extern int ntype;
-extern char *parts[NPARTS + 1];
-extern char *types[NTYPES + 1];
-extern int userrs;
-
 #define	quitser	pipeser
 
 /* mhparse.c */
 int debugsw = 0;
-CT parse_mime (char *);
-
-/* mhmisc.c */
-int part_ok (CT, int);
-int type_ok (CT, int);
-void flush_errors (void);
-
-/* mhstoresbr.c */
-void store_all_messages (mhstoreinfo_t);
-
-/* mhfree.c */
-extern CT *cts;
-void freects_done (int) NORETURN;
 
 /*
  * static prototypes
@@ -148,9 +119,9 @@ main (int argc, char **argv)
 do_cache:
 		if (!(cp = *argp++) || *cp == '-')
 		    adios (NULL, "missing argument to %s", argp[-2]);
-		switch (*icachesw = smatch (cp, caches)) {
+		switch (*icachesw = smatch (cp, cache_policy)) {
 		case AMBIGSW:
-		    ambigsw (cp, caches);
+		    ambigsw (cp, cache_policy);
 		    done (1);
 		case UNKWNSW:
 		    adios (NULL, "%s unknown", cp);
@@ -184,6 +155,22 @@ do_cache:
 		types[ntype++] = cp;
 		continue;
 
+	    case PREFERSW:
+		if (!(cp = *argp++) || *cp == '-')
+		    adios (NULL, "missing argument to %s", argp[-2]);
+		if (npreferred >= NPREFS)
+		    adios (NULL, "too many preferred types (starting with %s), %d max",
+			   cp, NPREFS);
+		mime_preference[npreferred].type = cp;
+		cp = strchr(cp, '/');
+		if (cp) *cp++ = '\0';
+		mime_preference[npreferred++].subtype = cp;
+		continue;
+
+	    case NPREFERSW:
+		npreferred = 0;
+		continue;
+
 	    case FILESW:
 		if (!(cp = *argp++) || (*cp == '-' && cp[1]))
 		    adios (NULL, "missing argument to %s", argp[-2]);
@@ -215,8 +202,7 @@ do_cache:
 	if (*cp == '+' || *cp == '@') {
 	    if (folder)
 		adios (NULL, "only one folder at a time!");
-	    else
-		folder = pluspath (cp);
+            folder = pluspath (cp);
 	} else
 		app_msgarg(&msgs, cp);
     }
@@ -230,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);
@@ -241,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);
     }
 
@@ -257,7 +243,7 @@ do_cache:
     /*
      * Cache the current directory before we do any chdirs()'s.
      */
-    cwd = add(pwd(), NULL);
+    cwd = mh_xstrdup(pwd());
 
     if (!context_find ("path"))
 	free (path ("./", TFOLDER));
@@ -269,14 +255,13 @@ do_cache:
      * check if message is coming from file
      */
     if (file) {
-	if (!(cts = (CT *) mh_xcalloc ((size_t) 2, sizeof(*cts))))
-	    adios (NULL, "out of memory");
+	cts = mh_xcalloc(2, sizeof *cts);
 	ctp = cts;
 
 	if ((ct = parse_mime (file))) {
 	    *ctp++ = ct;
 	    if (outfile) {
-		ct->c_storage = outfile;
+		ct->c_storage = mh_xstrdup(outfile);
 	    }
         }
     } else {
@@ -306,8 +291,7 @@ do_cache:
 		done (1);
 	seq_setprev (mp);	/* set the previous-sequence */
 
-	if (!(cts = (CT *) mh_xcalloc ((size_t) (mp->numsel + 1), sizeof(*cts))))
-	    adios (NULL, "out of memory");
+	cts = mh_xcalloc(mp->numsel + 1, sizeof *cts);
 	ctp = cts;
 
 	for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
@@ -318,7 +302,7 @@ do_cache:
 		if ((ct = parse_mime (msgnam))) {
 		    *ctp++ = ct;
 		    if (outfile) {
-			ct->c_storage = add (outfile, NULL);
+			ct->c_storage = mh_xstrdup(outfile);
 		    }
                 }
 	    }