X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/b56c88e2847c582f9b18ae5bbda44f033cd49c42..665dfc96:/uip/mhstore.c?ds=sidebyside

diff --git a/uip/mhstore.c b/uip/mhstore.c
index fb5349fa..2b844c2a 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
@@ -29,6 +27,7 @@
     X("outfile outfile", 0, OUTFILESW) \
     X("part number", 0, PARTSW) \
     X("type content", 0, TYPESW) \
+    X("prefer content", 0, PREFERSW) \
     X("rcache policy", 0, RCACHESW) \
     X("wcache policy", 0, WCACHESW) \
     X("version", 0, VERSIONSW) \
@@ -45,19 +44,12 @@ DEFINE_SWITCH_ARRAY(MHSTORE, switches);
 #undef X
 
 
-int save_clobber_policy (const char *);
-extern int files_not_clobbered;
-
 /* mhcachesbr.c */
 extern int rcachesw;
 extern int wcachesw;
 extern char *cache_public;
 extern char *cache_private;
 
-/* mhstoresbr.c */
-extern int autosw;
-extern char *cwd;	/* cache current working directory */
-
 /* mhmisc.c */
 extern int npart;
 extern int ntype;
@@ -65,22 +57,22 @@ extern char *parts[NPARTS + 1];
 extern char *types[NTYPES + 1];
 extern int userrs;
 
-int debugsw = 0;
-int verbosw = 0;
+/* 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 *);
 
 /* mhmisc.c */
-int part_ok (CT, int);
+int part_ok (CT);
 int type_ok (CT, int);
 void flush_errors (void);
 
-/* mhstoresbr.c */
-void store_all_messages (CT *);
-
 /* mhfree.c */
 extern CT *cts;
 void freects_done (int) NORETURN;
@@ -94,14 +86,19 @@ static void pipeser (int);
 int
 main (int argc, char **argv)
 {
-    int msgnum, *icachesw;
+    /* verbosw defaults to 1 for backward compatibility. */
+    int msgnum, *icachesw, autosw = 0, verbosw = 1;
+    const char *clobbersw = "always";
     char *cp, *file = NULL, *outfile = NULL, *folder = NULL;
     char *maildir, buf[100], **argp;
     char **arguments;
+    char *cwd;
     struct msgs_array msgs = { 0, 0, NULL };
     struct msgs *mp = NULL;
     CT ct, *ctp;
     FILE *fp;
+    int files_not_clobbered;
+    mhstoreinfo_t info;
 
     if (nmh_init(argv[0], 1)) { return 1; }
 
@@ -116,13 +113,13 @@ main (int argc, char **argv)
     while ((cp = *argp++)) {
 	if (*cp == '-') {
 	    switch (smatch (++cp, switches)) {
-	    case AMBIGSW: 
+	    case AMBIGSW:
 		ambigsw (cp, switches);
 		done (1);
-	    case UNKWNSW: 
+	    case UNKWNSW:
 		adios (NULL, "-%s unknown", cp);
 
-	    case HELPSW: 
+	    case HELPSW:
 		snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
 			invo_name);
 		print_help (buf, switches, 1);
@@ -182,6 +179,18 @@ 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);
+		preferred_types[npreferred] = cp;
+		cp = strchr(cp, '/');
+		if (cp) *cp++ = '\0';
+		preferred_subtypes[npreferred++] = cp;
+		continue;
+
 	    case FILESW:
 		if (!(cp = *argp++) || (*cp == '-' && cp[1]))
 		    adios (NULL, "missing argument to %s", argp[-2]);
@@ -194,19 +203,16 @@ do_cache:
 		outfile = *cp == '-' ? cp : path (cp, TFILE);
 		continue;
 
-	    case VERBSW: 
+	    case VERBSW:
 		verbosw = 1;
 		continue;
-	    case NVERBSW: 
+	    case NVERBSW:
 		verbosw = 0;
 		continue;
             case CLOBBERSW:
 		if (!(cp = *argp++) || *cp == '-')
 		    adios (NULL, "missing argument to %s", argp[-2]);
-                if (save_clobber_policy (cp)) {
-                  adios (NULL, "invalid argument, %s, to %s", argp[-1],
-                         argp[-2]);
-                }
+		clobbersw = cp;
 		continue;
 	    case DEBUGSW:
 		debugsw = 1;
@@ -258,7 +264,7 @@ do_cache:
     /*
      * Cache the current directory before we do any chdirs()'s.
      */
-    cwd = getcpy (pwd());
+    cwd = mh_xstrdup(pwd());
 
     if (!context_find ("path"))
 	free (path ("./", TFOLDER));
@@ -270,14 +276,13 @@ do_cache:
      * check if message is coming from file
      */
     if (file) {
-	if (!(cts = (CT *) calloc ((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 {
@@ -307,8 +312,7 @@ do_cache:
 		done (1);
 	seq_setprev (mp);	/* set the previous-sequence */
 
-	if (!(cts = (CT *) calloc ((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++) {
@@ -319,7 +323,7 @@ do_cache:
 		if ((ct = parse_mime (msgnam))) {
 		    *ctp++ = ct;
 		    if (outfile) {
-			ct->c_storage = add (outfile, NULL);
+			ct->c_storage = mh_xstrdup(outfile);
 		    }
                 }
 	    }
@@ -351,13 +355,16 @@ do_cache:
     /*
      * Store the message content
      */
-    store_all_messages (cts);
+    info = mhstoreinfo_create (cts, cwd, clobbersw, autosw, verbosw);
+    store_all_messages (info);
+    files_not_clobbered = mhstoreinfo_files_not_clobbered(info);
+    mhstoreinfo_free(info);
 
     /* Now free all the structures for the content */
     for (ctp = cts; *ctp; ctp++)
 	free_content (*ctp);
 
-    free ((char *) cts);
+    free (cts);
     cts = NULL;
 
     /* If reading from a folder, do some updating */