X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/207d657cf4495be3eb44ccde94e807692665f5e2..ef1ba39e8dae81091b6c3e73e72825ef6edea3c6:/uip/mhstore.c diff --git a/uip/mhstore.c b/uip/mhstore.c index fa30e035..183fe7d4 100644 --- a/uip/mhstore.c +++ b/uip/mhstore.c @@ -11,8 +11,6 @@ #include #include #include -#include -#include #include #include #include @@ -20,50 +18,33 @@ #include #include -static struct swit switches[] = { -#define AUTOSW 0 - { "auto", 0 }, -#define NAUTOSW 1 - { "noauto", 0 }, -#define CHECKSW 2 - { "check", 0 }, -#define NCHECKSW 3 - { "nocheck", 0 }, -#define VERBSW 4 - { "verbose", 0 }, -#define NVERBSW 5 - { "noverbose", 0 }, -#define FILESW 6 /* interface from show */ - { "file file", 0 }, -#define PARTSW 7 - { "part number", 0 }, -#define TYPESW 8 - { "type content", 0 }, -#define RCACHESW 9 - { "rcache policy", 0 }, -#define WCACHESW 10 - { "wcache policy", 0 }, -#define VERSIONSW 11 - { "version", 0 }, -#define HELPSW 12 - { "help", 0 }, -#define CLOBBERSW 13 - { "clobber always|auto|suffix|ask|never", 0 }, +#define MHSTORE_SWITCHES \ + X("auto", 0, AUTOSW) \ + X("noauto", 0, NAUTOSW) \ + X("check", 0, CHECKSW) \ + X("nocheck", 0, NCHECKSW) \ + 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("rcache policy", 0, RCACHESW) \ + X("wcache policy", 0, WCACHESW) \ + X("version", 0, VERSIONSW) \ + X("help", 0, HELPSW) \ + X("clobber always|auto|suffix|ask|never", 0, CLOBBERSW) \ + X("debug", -5, DEBUGSW) \ + +#define X(sw, minchars, id) id, +DEFINE_SWITCH_ENUM(MHSTORE); +#undef X + +#define X(sw, minchars, id) { sw, minchars, id }, +DEFINE_SWITCH_ARRAY(MHSTORE, switches); +#undef X -/* - * switches for debugging - */ -#define DEBUGSW 14 - { "debug", -5 }, - { NULL, 0 } -}; - - -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; @@ -71,10 +52,6 @@ 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; @@ -82,24 +59,23 @@ 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 */ -void free_content (CT); extern CT *cts; void freects_done (int) NORETURN; @@ -112,24 +88,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; @@ -140,13 +115,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); @@ -206,25 +181,40 @@ 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]); 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; @@ -276,17 +266,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 = add(pwd(), NULL); if (!context_find ("path")) free (path ("./", TFOLDER)); @@ -298,12 +278,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 = add (outfile, NULL); + } + } } else { /* * message(s) are coming from a folder @@ -318,7 +301,7 @@ do_cache: adios (maildir, "unable to change directory to"); /* read folder and create message structure */ - if (!(mp = folder_read (folder))) + if (!(mp = folder_read (folder, 1))) adios (NULL, "unable to read folder %s", folder); /* check for empty folder */ @@ -331,8 +314,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++) { @@ -340,8 +322,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 = add (outfile, NULL); + } + } } } } @@ -371,13 +357,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 */ @@ -397,7 +386,6 @@ static void pipeser (int i) { if (i == SIGQUIT) { - unlink ("core"); fflush (stdout); fprintf (stderr, "\n"); fflush (stderr);