repl.c, replsbr.c: Move shared data into header file.

[nmh] / uip / mhstore.c

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 72079a81662fd8f46f97fdb23196e90ba41244b5..66ad91e99e99f51bb652dc6d0b59b0cf4b8aa41c 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) \


@@ -29,6 +31,8 @@
     X("outfile outfile", 0, OUTFILESW) \
     X("part number", 0, PARTSW) \
     X("type content", 0, TYPESW) \
     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) \
     X("rcache policy", 0, RCACHESW) \
     X("wcache policy", 0, WCACHESW) \
     X("version", 0, VERSIONSW) \


@@ -45,42 +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;
-
-/* 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;
 #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
 
 /*
  * static prototypes


@@ -91,8 +63,10 @@ static void pipeser (int);
 int
 main (int argc, char **argv)
 {
 int
 main (int argc, char **argv)
 {

+    int msgnum, *icachesw;
+    bool autosw = false;

     /* verbosw defaults to 1 for backward compatibility. */
     /* verbosw defaults to 1 for backward compatibility. */

-    int msgnum, *icachesw, autosw = 0, verbosw = 1;
+    bool verbosw = true;

     const char *clobbersw = "always";
     char *cp, *file = NULL, *outfile = NULL, *folder = NULL;
     char *maildir, buf[100], **argp;
     const char *clobbersw = "always";
     char *cp, *file = NULL, *outfile = NULL, *folder = NULL;
     char *maildir, buf[100], **argp;


@@ -105,9 +79,9 @@ main (int argc, char **argv)
     int files_not_clobbered;
     mhstoreinfo_t info;
 
     int files_not_clobbered;
     mhstoreinfo_t info;
 

-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { 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;


@@ -122,7 +96,7 @@ main (int argc, char **argv)
                ambigsw (cp, switches);
                done (1);
            case UNKWNSW:
                ambigsw (cp, switches);
                done (1);
            case UNKWNSW:

-               adios (NULL, "-%s unknown", cp);
+               die("-%s unknown", cp);

 
            case HELPSW:
                snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
 
            case HELPSW:
                snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",


@@ -134,10 +108,10 @@ main (int argc, char **argv)
                done (0);
 
            case AUTOSW:
                done (0);
 
            case AUTOSW:

-               autosw++;
+               autosw = true;

                continue;
            case NAUTOSW:
                continue;
            case NAUTOSW:

-               autosw = 0;
+               autosw = false;

                continue;
 
            case RCACHESW:
                continue;
 
            case RCACHESW:


@@ -147,13 +121,13 @@ main (int argc, char **argv)
                icachesw = &wcachesw;
 do_cache:
                if (!(cp = *argp++) || *cp == '-')
                icachesw = &wcachesw;
 do_cache:
                if (!(cp = *argp++) || *cp == '-')

-                   adios (NULL, "missing argument to %s", argp[-2]);
-               switch (*icachesw = smatch (cp, caches)) {
+                   die("missing argument to %s", argp[-2]);
+               switch (*icachesw = smatch (cp, cache_policy)) {

                case AMBIGSW:
                case AMBIGSW:

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

                    done (1);
                case UNKWNSW:
                    done (1);
                case UNKWNSW:

-                   adios (NULL, "%s unknown", cp);
+                   die("%s unknown", cp);

                default:
                    break;
                }
                default:
                    break;
                }


@@ -168,43 +142,59 @@ do_cache:
 
            case PARTSW:
                if (!(cp = *argp++) || *cp == '-')
 
            case PARTSW:
                if (!(cp = *argp++) || *cp == '-')

-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);

                if (npart >= NPARTS)
                if (npart >= NPARTS)

-                   adios (NULL, "too many parts (starting with %s), %d max",
+                   die("too many parts (starting with %s), %d max",

                           cp, NPARTS);
                parts[npart++] = cp;
                continue;
 
            case TYPESW:
                if (!(cp = *argp++) || *cp == '-')
                           cp, NPARTS);
                parts[npart++] = cp;
                continue;
 
            case TYPESW:
                if (!(cp = *argp++) || *cp == '-')

-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);

                if (ntype >= NTYPES)
                if (ntype >= NTYPES)

-                   adios (NULL, "too many types (starting with %s), %d max",
+                   die("too many types (starting with %s), %d max",

                           cp, NTYPES);
                types[ntype++] = cp;
                continue;
 
                           cp, NTYPES);
                types[ntype++] = cp;
                continue;
 

+           case PREFERSW:
+               if (!(cp = *argp++) || *cp == '-')
+                   die("missing argument to %s", argp[-2]);
+               if (npreferred >= NPREFS)
+                   die("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]))
            case FILESW:
                if (!(cp = *argp++) || (*cp == '-' && cp[1]))

-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);

                file = *cp == '-' ? cp : path (cp, TFILE);
                continue;
 
            case OUTFILESW:
                if (!(cp = *argp++) || (*cp == '-' && cp[1]))
                file = *cp == '-' ? cp : path (cp, TFILE);
                continue;
 
            case OUTFILESW:
                if (!(cp = *argp++) || (*cp == '-' && cp[1]))

-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);

                outfile = *cp == '-' ? cp : path (cp, TFILE);
                continue;
 
            case VERBSW:
                outfile = *cp == '-' ? cp : path (cp, TFILE);
                continue;
 
            case VERBSW:

-               verbosw = 1;
+               verbosw = true;

                continue;
            case NVERBSW:
                continue;
            case NVERBSW:

-               verbosw = 0;
+               verbosw = false;

                continue;
             case CLOBBERSW:
                if (!(cp = *argp++) || *cp == '-')
                continue;
             case CLOBBERSW:
                if (!(cp = *argp++) || *cp == '-')

-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);

                clobbersw = cp;
                continue;
            case DEBUGSW:
                clobbersw = cp;
                continue;
            case DEBUGSW:


@@ -214,9 +204,8 @@ do_cache:
        }
        if (*cp == '+' || *cp == '@') {
            if (folder)
        }
        if (*cp == '+' || *cp == '@') {
            if (folder)

-               adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+               die("only one folder at a time!");
+            folder = pluspath (cp);

        } else
                app_msgarg(&msgs, cp);
     }
        } else
                app_msgarg(&msgs, cp);
     }


@@ -230,7 +219,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);


@@ -241,7 +230,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);
     }
 


@@ -252,31 +241,30 @@ do_cache:
     /* Check for private cache location */
     if (!(cache_private = context_find (nmhprivcache)))
        cache_private = ".cache";
     /* Check for private cache location */
     if (!(cache_private = context_find (nmhprivcache)))
        cache_private = ".cache";

-    cache_private = getcpy (m_maildir (cache_private));
+    cache_private = mh_xstrdup(m_maildir(cache_private));

 
     /*
      * 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 (file && msgs.size)
 
     if (!context_find ("path"))
        free (path ("./", TFOLDER));
 
     if (file && msgs.size)

-       adios (NULL, "cannot specify msg and file at same time!");
+       die("cannot specify msg and file at same time!");

 
     /*
      * check if message is coming from file
      */
     if (file) {
 
     /*
      * 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) {
        ctp = cts;
 
        if ((ct = parse_mime (file))) {
            *ctp++ = ct;
            if (outfile) {

-               ct->c_storage = outfile;
+               ct->c_storage = mh_xstrdup(outfile);

            }
         }
     } else {
            }
         }
     } else {


@@ -294,11 +282,11 @@ do_cache:
 
        /* read folder and create message structure */
        if (!(mp = folder_read (folder, 1)))
 
        /* read folder and create message structure */
        if (!(mp = folder_read (folder, 1)))

-           adios (NULL, "unable to read folder %s", folder);
+           die("unable to read folder %s", folder);

 
        /* check for empty folder */
        if (mp->nummsg == 0)
 
        /* check for empty folder */
        if (mp->nummsg == 0)

-           adios (NULL, "no messages in %s", folder);
+           die("no messages in %s", folder);

 
        /* parse all the message ranges/sequences and set SELECTED */
        for (msgnum = 0; msgnum < msgs.size; msgnum++)
 
        /* parse all the message ranges/sequences and set SELECTED */
        for (msgnum = 0; msgnum < msgs.size; msgnum++)


@@ -306,8 +294,7 @@ do_cache:
                done (1);
        seq_setprev (mp);       /* set the previous-sequence */
 
                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++) {
        ctp = cts;
 
        for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {


@@ -318,7 +305,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);

                    }
                 }
            }
                    }
                 }
            }


@@ -328,7 +315,7 @@ do_cache:
     if (!*cts)
        done (1);
 
     if (!*cts)
        done (1);
 

-    userrs = 1;
+    userrs = true;

     SIGNAL (SIGQUIT, quitser);
     SIGNAL (SIGPIPE, pipeser);
 
     SIGNAL (SIGQUIT, quitser);
     SIGNAL (SIGPIPE, pipeser);