X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6b4bc4a25eaac2eddd1bef51e3f00c21f98ed32d..63621a81d16ab743de6b57d47578a9a2c670ad22:/uip/mhstore.c diff --git a/uip/mhstore.c b/uip/mhstore.c index cd84aeef..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 @@ -11,14 +9,15 @@ #include #include #include -#include -#include #include #include #include #include #include #include +#include "mhmisc.h" +#include "sbr/m_maildir.h" +#include "mhfree.h" #define MHSTORE_SWITCHES \ X("auto", 0, AUTOSW) \ @@ -28,8 +27,11 @@ X("verbose", 0, VERBSW) \ X("noverbose", 0, NVERBSW) \ X("file file", 0, FILESW) /* interface from show */ \ + 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) \ @@ -46,48 +48,10 @@ DEFINE_SWITCH_ARRAY(MHSTORE, switches); #undef X -int save_clobber_policy (const char *); -extern int files_not_clobbered; - -/* mhparse.c */ -extern char *tmp; /* directory to place temp files */ - -/* 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; -extern char *parts[NPARTS + 1]; -extern char *types[NTYPES + 1]; -extern int userrs; - -int debugsw = 0; -int verbosw = 0; - #define quitser pipeser /* mhparse.c */ -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 (CT *); - -/* mhfree.c */ -extern CT *cts; -void freects_done (int) NORETURN; +int debugsw = 0; /* * static prototypes @@ -98,24 +62,23 @@ static void pipeser (int); int main (int argc, char **argv) { - int msgnum, *icachesw; - char *cp, *file = NULL, *folder = NULL; + /* 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; - done=freects_done; - -#ifdef LOCALE - setlocale(LC_ALL, ""); -#endif - invo_name = r1bindex (argv[0], '/'); + if (nmh_init(argv[0], 1)) { return 1; } - /* read user profile/context */ - context_read(); + done=freects_done; arguments = getarguments (invo_name, argc, argv, 1); argp = arguments; @@ -126,13 +89,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); @@ -156,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); @@ -192,25 +155,44 @@ 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]); file = *cp == '-' ? cp : path (cp, TFILE); continue; - case VERBSW: + case OUTFILESW: + if (!(cp = *argp++) || (*cp == '-' && cp[1])) + adios (NULL, "missing argument to %s", argp[-2]); + outfile = *cp == '-' ? cp : path (cp, TFILE); + continue; + + 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; @@ -220,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); } @@ -235,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); @@ -246,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); } @@ -262,17 +243,7 @@ do_cache: /* * Cache the current directory before we do any chdirs()'s. */ - cwd = getcpy (pwd()); - - /* - * Check for storage directory. If specified, - * then store temporary files there. Else we - * store them in standard nmh directory. - */ - if ((cp = context_find (nmhstorage)) && *cp) - tmp = concat (cp, "/", invo_name, NULL); - else - tmp = add (m_maildir (invo_name), NULL); + cwd = mh_xstrdup(pwd()); if (!context_find ("path")) free (path ("./", TFOLDER)); @@ -284,12 +255,15 @@ 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))) + if ((ct = parse_mime (file))) { *ctp++ = ct; + if (outfile) { + ct->c_storage = mh_xstrdup(outfile); + } + } } else { /* * message(s) are coming from a folder @@ -317,8 +291,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++) { @@ -326,8 +299,12 @@ do_cache: char *msgnam; msgnam = m_name (msgnum); - if ((ct = parse_mime (msgnam))) + if ((ct = parse_mime (msgnam))) { *ctp++ = ct; + if (outfile) { + ct->c_storage = mh_xstrdup(outfile); + } + } } } } @@ -357,13 +334,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 */