Added tests of MMDF mailbox format to test-eom-align.

[nmh] / uip / mhstore.c

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 183fe7d4d138ca87ba7a9e81176f66f7101cd684..7fa819aaf29ce761275ef356eef812b0fe1f481e 100644 (file)
--- 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
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -16,7 +14,11 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>

+#include "h/done.h"

 #include <h/utils.h>
 #include <h/utils.h>

+#include "mhmisc.h"
+#include "sbr/m_maildir.h"
+#include "mhfree.h"

 
 #define MHSTORE_SWITCHES \
     X("auto", 0, AUTOSW) \
 
 #define MHSTORE_SWITCHES \
     X("auto", 0, AUTOSW) \


@@ -30,6 +32,7 @@
     X("part number", 0, PARTSW) \
     X("type content", 0, TYPESW) \
     X("prefer content", 0, PREFERSW) \
     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) \
     X("rcache policy", 0, RCACHESW) \
     X("wcache policy", 0, WCACHESW) \
     X("version", 0, VERSIONSW) \


@@ -46,38 +49,10 @@ DEFINE_SWITCH_ARRAY(MHSTORE, switches);
 #undef X
 
 
 #undef X
 
 

-/* mhcachesbr.c */
-extern int rcachesw;
-extern int wcachesw;
-extern char *cache_public;
-extern char *cache_private;
-
-/* 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;
 #define        quitser pipeser
 
 /* mhparse.c */
 int debugsw = 0;

-CT parse_mime (char *);
-
-/* mhmisc.c */
-int part_ok (CT);
-int type_ok (CT, int);
-void flush_errors (void);
-
-/* mhfree.c */
-extern CT *cts;
-void freects_done (int) NORETURN;

 
 /*
  * static prototypes
 
 /*
  * static prototypes


@@ -104,7 +79,7 @@ main (int argc, char **argv)
 
     if (nmh_init(argv[0], 1)) { return 1; }
 
 
     if (nmh_init(argv[0], 1)) { return 1; }
 

-    done=freects_done;
+    set_done(freects_done);

 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;


@@ -145,9 +120,9 @@ main (int argc, char **argv)
 do_cache:
                if (!(cp = *argp++) || *cp == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
 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:
                case AMBIGSW:

-                   ambigsw (cp, caches);
+                   ambigsw (cp, cache_policy);

                    done (1);
                case UNKWNSW:
                    adios (NULL, "%s unknown", cp);
                    done (1);
                case UNKWNSW:
                    adios (NULL, "%s unknown", cp);


@@ -187,10 +162,14 @@ do_cache:
                if (npreferred >= NPREFS)
                    adios (NULL, "too many preferred types (starting with %s), %d max",
                           cp, NPREFS);
                if (npreferred >= NPREFS)
                    adios (NULL, "too many preferred types (starting with %s), %d max",
                           cp, NPREFS);

-               preferred_types[npreferred] = cp;
+               mime_preference[npreferred].type = cp;

                cp = strchr(cp, '/');
                if (cp) *cp++ = '\0';
                cp = strchr(cp, '/');
                if (cp) *cp++ = '\0';

-               preferred_subtypes[npreferred++] = cp;
+               mime_preference[npreferred++].subtype = cp;
+               continue;
+
+           case NPREFERSW:
+               npreferred = 0;

                continue;
 
            case FILESW:
                continue;
 
            case FILESW:


@@ -224,8 +203,7 @@ do_cache:
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
        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);
     }
        } else
                app_msgarg(&msgs, cp);
     }


@@ -239,7 +217,7 @@ do_cache:
      */
     if ((cp = getenv ("MHSTORE"))) {
        if ((fp = fopen (cp, "r"))) {
      */
     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);
            fclose (fp);
        } else {
            admonish ("", "unable to read $MHSTORE profile (%s)", cp);


@@ -250,7 +228,7 @@ do_cache:
      * Read the standard profile setup
      */
     if ((fp = fopen (cp = etcpath ("mhn.defaults"), "r"))) {
      * 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);
     }
 
        fclose (fp);
     }
 


@@ -266,7 +244,7 @@ do_cache:
     /*
      * Cache the current directory before we do any chdirs()'s.
      */
     /*
      * 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));
 
     if (!context_find ("path"))
        free (path ("./", TFOLDER));


@@ -284,7 +262,7 @@ do_cache:
        if ((ct = parse_mime (file))) {
            *ctp++ = ct;
            if (outfile) {
        if ((ct = parse_mime (file))) {
            *ctp++ = ct;
            if (outfile) {

-               ct->c_storage = add (outfile, NULL);
+               ct->c_storage = mh_xstrdup(outfile);

            }
         }
     } else {
            }
         }
     } else {


@@ -325,7 +303,7 @@ do_cache:
                if ((ct = parse_mime (msgnam))) {
                    *ctp++ = ct;
                    if (outfile) {
                if ((ct = parse_mime (msgnam))) {
                    *ctp++ = ct;
                    if (outfile) {

-                       ct->c_storage = add (outfile, NULL);
+                       ct->c_storage = mh_xstrdup(outfile);

                    }
                 }
            }
                    }
                 }
            }