X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhstore.c;h=fae054fa1461075beb4b4ea7b2a5b5e3b886ba03;hp=e510d1396419e2c00c7850f51f3904fa517a8ebd;hb=6e7d34c614291079de750ceda1d4f5ec537beb81;hpb=fc71710f8695ea07d852284286b058ecb3955317 diff --git a/uip/mhstore.c b/uip/mhstore.c index e510d13..fae054f 100644 --- a/uip/mhstore.c +++ b/uip/mhstore.c @@ -9,48 +9,33 @@ #include #include #include -#include #include -#include #include #include #include #include -#include #include +#include +#include +#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 */ + { "noauto", 2 }, +#define FILESW 2 /* interface from show */ { "file file", 0 }, -#define PARTSW 7 +#define PARTSW 3 { "part number", 0 }, -#define TYPESW 8 +#define TYPESW 4 { "type content", 0 }, -#define RCACHESW 9 - { "rcache policy", 0 }, -#define WCACHESW 10 - { "wcache policy", 0 }, -#define VERSIONSW 11 - { "version", 0 }, -#define HELPSW 12 +#define VERSIONSW 5 + { "Version", 0 }, +#define HELPSW 6 { "help", 0 }, - -/* -** switches for debugging -*/ -#define DEBUGSW 13 +#define DEBUGSW 7 { "debug", -5 }, { NULL, 0 } }; @@ -59,12 +44,6 @@ static struct swit switches[] = { /* 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; - /* mhmisc.c */ extern int npart; extern int ntype; @@ -73,7 +52,6 @@ extern char *types[NTYPES + 1]; extern int userrs; int debugsw = 0; -int verbosw = 0; #define quitser pipeser @@ -89,14 +67,14 @@ void flush_errors(void); /* mhfree.c */ void free_content(CT); extern CT *cts; /* The list of top-level contents to display */ -void freects_done(int) NORETURN; +void freects_done(); /* ** static prototypes */ static void pipeser(int); -int autosw = 0; +int autosw = 1; /* ** Cache of current directory. This must be @@ -123,7 +101,7 @@ int make_intermediates(char *); void flush_errors(void); /* mhshowsbr.c */ -int show_content_aux(CT, int, int, char *, char *); +int show_content_aux(CT, int, char *, char *); /* ** static prototypes @@ -131,7 +109,6 @@ int show_content_aux(CT, int, int, char *, char *); static void store_single_message(CT); static int store_switch(CT); static int store_generic(CT); -static int store_application(CT); static int store_multi(CT); static int store_partial(CT); static int store_external(CT); @@ -140,7 +117,6 @@ static int store_content(CT, CT); static int output_content_file(CT, int); static int output_content_folder(char *, char *); static int parse_format_string(CT, char *, char *, int, char *); -static void get_storeproc(CT); static int copy_some_headers(FILE *, CT); static void store_all_messages(CT *); @@ -148,7 +124,7 @@ static void store_all_messages(CT *); int main(int argc, char **argv) { - int msgnum, *icachesw; + int msgnum; char *cp, *file = NULL, *folder = NULL; char *maildir, buf[100], **argp; char **arguments; @@ -157,11 +133,11 @@ main(int argc, char **argv) CT ct, *ctp; FILE *fp; - done=freects_done; + if (atexit(freects_done) != 0) { + adios(EX_OSERR, NULL, "atexit failed"); + } -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ @@ -178,17 +154,17 @@ main(int argc, char **argv) switch (smatch(++cp, switches)) { case AMBIGSW: ambigsw(cp, switches); - done(1); + exit(EX_USAGE); case UNKWNSW: - adios(NULL, "-%s unknown", cp); + adios(EX_USAGE, NULL, "-%s unknown", cp); case HELPSW: snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name); print_help(buf, switches, 1); - done(1); + exit(argc == 2 ? EX_OK : EX_USAGE); case VERSIONSW: print_version(invo_name); - done(1); + exit(argc == 2 ? EX_OK : EX_USAGE); case AUTOSW: autosw++; @@ -197,64 +173,31 @@ main(int argc, char **argv) autosw = 0; continue; - case RCACHESW: - icachesw = &rcachesw; - goto do_cache; - case WCACHESW: - icachesw = &wcachesw; -do_cache: - if (!(cp = *argp++) || *cp == '-') - adios(NULL, "missing argument to %s", - argp[-2]); - switch (*icachesw = smatch(cp, caches)) { - case AMBIGSW: - ambigsw(cp, caches); - done(1); - case UNKWNSW: - adios(NULL, "%s unknown", cp); - default: - break; - } - continue; - - case CHECKSW: - checksw++; - continue; - case NCHECKSW: - checksw = 0; - continue; - case PARTSW: if (!(cp = *argp++) || *cp == '-') - adios(NULL, "missing argument to %s", + adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]); if (npart >= NPARTS) - adios(NULL, "too many parts (starting with %s), %d max", cp, NPARTS); + adios(EX_USAGE, NULL, "too many parts (starting with %s), %d max", cp, NPARTS); parts[npart++] = cp; continue; case TYPESW: if (!(cp = *argp++) || *cp == '-') - adios(NULL, "missing argument to %s", + adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]); if (ntype >= NTYPES) - adios(NULL, "too many types (starting with %s), %d max", cp, NTYPES); + adios(EX_USAGE, NULL, "too many types (starting with %s), %d max", cp, NTYPES); types[ntype++] = cp; continue; case FILESW: if (!(cp = *argp++) || (*cp == '-' && cp[1])) - adios(NULL, "missing argument to %s", + adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]); file = *cp == '-' ? cp : getcpy(expanddir(cp)); continue; - case VERBSW: - verbosw = 1; - continue; - case NVERBSW: - verbosw = 0; - continue; case DEBUGSW: debugsw = 1; continue; @@ -262,7 +205,7 @@ do_cache: } if (*cp == '+' || *cp == '@') { if (folder) - adios(NULL, "only one folder at a time!"); + adios(EX_USAGE, NULL, "only one folder at a time!"); else folder = getcpy(expandfol(cp)); } else @@ -296,15 +239,6 @@ do_cache: fclose(fp); } - /* Check for public cache location */ - if ((cache_public = context_find(nmhcache)) && *cache_public != '/') - cache_public = NULL; - - /* Check for private cache location */ - if (!(cache_private = context_find(nmhprivcache))) - cache_private = ".cache"; - cache_private = getcpy(toabsdir(cache_private)); - /* ** Cache the current directory before we do any chdirs()'s. */ @@ -321,14 +255,13 @@ do_cache: tmp = getcpy(toabsdir(invo_name)); if (file && msgs.size) - adios(NULL, "cannot specify msg and file at same time!"); + adios(EX_USAGE, NULL, "cannot specify msg and file at same time!"); /* ** check if message is coming from file */ if (file) { - if (!(cts = (CT *) calloc((size_t) 2, sizeof(*cts)))) - adios(NULL, "out of memory"); + cts = (CT *) mh_xcalloc((size_t) 2, sizeof(*cts)); ctp = cts; if ((ct = parse_mime(file))) @@ -344,25 +277,24 @@ do_cache: maildir = toabsdir(folder); if (chdir(maildir) == NOTOK) - adios(maildir, "unable to change directory to"); + adios(EX_OSERR, maildir, "unable to change directory to"); /* read folder and create message structure */ if (!(mp = folder_read(folder))) - adios(NULL, "unable to read folder %s", folder); + adios(EX_IOERR, NULL, "unable to read folder %s", folder); /* check for empty folder */ if (mp->nummsg == 0) - adios(NULL, "no messages in %s", folder); + adios(EX_DATAERR, NULL, "no messages in %s", folder); /* parse all the message ranges/sequences and set SELECTED */ for (msgnum = 0; msgnum < msgs.size; msgnum++) if (!m_convert(mp, msgs.msgs[msgnum])) - done(1); + exit(EX_USAGE); seq_setprev(mp); /* set the previous-sequence */ - if (!(cts = (CT *) calloc((size_t) (mp->numsel + 1), - sizeof(*cts)))) - adios(NULL, "out of memory"); + cts = (CT *) mh_xcalloc((size_t) (mp->numsel + 1), + sizeof(*cts)); ctp = cts; for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) { @@ -377,7 +309,7 @@ do_cache: } if (!*cts) - done(1); + exit(EX_SOFTWARE); userrs = 1; SIGNAL(SIGQUIT, quitser); @@ -418,8 +350,7 @@ do_cache: context_save(); /* save the context file */ } - done(0); - return 1; + return 0; } @@ -431,9 +362,10 @@ pipeser(int i) fflush(stdout); fprintf(stderr, "\n"); fflush(stderr); + exit(EX_TEMPFAIL); } - done(1); + exit(EX_IOERR); /* NOTREACHED */ } @@ -451,9 +383,7 @@ store_all_messages(CT *cts) ** Check for the directory in which to ** store any contents. */ - if (autosw) - dir = getcpy(cwd); - else if ((cp = context_find(nmhstorage)) && *cp) + if ((cp = context_find(nmhstorage)) && *cp) dir = getcpy(cp); else dir = getcpy(cwd); @@ -517,9 +447,6 @@ store_switch(CT ct) break; case CT_APPLICATION: - return store_application(ct); - break; - case CT_TEXT: case CT_AUDIO: case CT_IMAGE: @@ -528,7 +455,7 @@ store_switch(CT ct) break; default: - adios(NULL, "unknown content type %d", ct->c_type); + adios(EX_DATAERR, NULL, "unknown content type %d", ct->c_type); break; } @@ -538,84 +465,36 @@ store_switch(CT ct) /* ** Generic routine to store a MIME content. -** (audio, video, image, text, message/rfc922) +** (application, audio, video, image, text, message/rfc922) */ - static int store_generic(CT ct) { - /* - ** Check if the content specifies a filename. - ** Don't bother with this for type "message" - ** (only "message/rfc822" will use store_generic). - */ - if (autosw && ct->c_type != CT_MESSAGE) - get_storeproc(ct); - - return store_content(ct, NULL); -} - - -/* -** Store content of type "application" -*/ - -static int -store_application(CT ct) -{ - char **ap, **ep; + char **ap, **vp, *cp; CI ci = &ct->c_ctinfo; - /* Check if the content specifies a filename */ - if (autosw) - get_storeproc(ct); - /* - ** If storeproc is not defined, and the content is type - ** "application/octet-stream", we also check for various - ** attribute/value pairs which specify if this a tar file. + ** Check if the content specifies a filename in its MIME parameters. + ** Don't bother with this for type "message" + ** (only the "message" subtype "rfc822" will use store_generic). */ - if (!ct->c_storeproc && ct->c_subtype == APPLICATION_OCTETS) { - int tarP = 0, zP = 0, gzP = 0; - - for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) { - /* check for "type=tar" attribute */ - if (!mh_strcasecmp(*ap, "type")) { - if (mh_strcasecmp(*ep, "tar")) - break; - - tarP = 1; - continue; - } - - /* check for "conversions=compress" attribute */ - if ((!mh_strcasecmp(*ap, "conversions") || - !mh_strcasecmp(*ap, "x-conversions")) - && (!mh_strcasecmp(*ep, "compress") || - !mh_strcasecmp(*ep, "x-compress"))) { - zP = 1; - continue; - } - /* check for "conversions=gzip" attribute */ - if ((!mh_strcasecmp(*ap, "conversions") || - !mh_strcasecmp(*ap, "x-conversions")) - && (!mh_strcasecmp(*ep, "gzip") || - !mh_strcasecmp(*ep, "x-gzip"))) { - gzP = 1; + if (autosw && ct->c_type != CT_MESSAGE) { + /* + ** Check the attribute/value pairs, for the attribute "name". + ** If found, take the basename, do a few sanity checks and + ** copy the value into c_storeproc. + */ + for (ap = ci->ci_attrs, vp = ci->ci_values; *ap; ap++,vp++) { + if (mh_strcasecmp(*ap, "name")!=0) { continue; } - } - - if (tarP) { - ct->c_showproc = getcpy(zP ? "%euncompress | tar tvf -" : (gzP ? "%egzip -dc | tar tvf -" : "%etar tvf -")); - if (!ct->c_storeproc) { - if (autosw) { - ct->c_storeproc = getcpy(zP ? "| uncompress | tar xvpf -" : (gzP ? "| gzip -dc | tar xvpf -" : "| tar xvpf -")); - ct->c_umask = 0022; - } else { - ct->c_storeproc= getcpy(zP ? "%m%P.tar.Z" : (gzP ? "%m%P.tar.gz" : "%m%P.tar")); - } + cp = mhbasename(*vp); + if (*cp && *cp!='.' && *cp!='|' && *cp!='!' && + !strchr(cp, '%')) { + /* filename looks good: use it */ + ct->c_storeproc = getcpy(cp); } + break; } } @@ -689,8 +568,7 @@ store_partial(CT ct) return NOTOK; } - if ((base = (CT *) calloc((size_t) (i + 1), sizeof(*base))) == NULL) - adios(NULL, "out of memory"); + base = (CT *) mh_xcalloc((size_t) (i + 1), sizeof(*base)); ctq = base; for (ctp = cts; *ctp; ctp++) { @@ -752,48 +630,36 @@ losing: /* -** Store content from a message of type "message/external". +** Show how to retrieve content of type "message/external". */ - static int store_external(CT ct) { - int result = NOTOK; - struct exbody *e = (struct exbody *) ct->c_ctparams; - CT p = e->eb_content; - - if (!type_ok(p, 1)) - return OK; - - /* - ** Check if the parameters for the external body - ** specified a filename. - */ - if (autosw) { - char *cp; + char **ap, **ep; + char *msg; + FILE *fp; + char buf[BUFSIZ]; - if ((cp = e->eb_name) && *cp != '/' && *cp != '.' && - *cp != '|' && *cp != '!' && !strchr(cp, '%')) { - if (!ct->c_storeproc) - ct->c_storeproc = getcpy(cp); - if (!p->c_storeproc) - p->c_storeproc = getcpy(cp); + msg = add("You need to fetch the contents yourself:", NULL); + ap = ct->c_ctinfo.ci_attrs; + ep = ct->c_ctinfo.ci_values; + for (; *ap; ap++, ep++) { + msg = add(concat("\n\t", *ap, ": ", *ep, NULL), msg); + } + if (!(fp = fopen(ct->c_file, "r"))) { + adios(EX_IOERR, ct->c_file, "unable to open"); + } + fseek(fp, ct->c_begin, SEEK_SET); + while (!feof(fp) && ftell(fp) < ct->c_end) { + if (!fgets(buf, sizeof buf, fp)) { + adios(EX_IOERR, ct->c_file, "unable to read"); } + *strchr(buf, '\n') = '\0'; + msg = add(concat("\n\t", buf, NULL), msg); } - - /* - ** Since we will let the Content structure for the - ** external body substitute for the current content, - ** we temporarily change its partno (number inside - ** multipart), so everything looks right. - */ - p->c_partno = ct->c_partno; - - /* we probably need to check if content is really there */ - result = store_switch(p); - - p->c_partno = NULL; - return result; + fclose(fp); + advise(NULL, msg); + return OK; } @@ -883,7 +749,7 @@ store_content(CT ct, CT p) ** 4) Else if content is "message", use "+" (current folder) ** 5) Else use string "%m%P.%s". */ - if ((cp = ct->c_storeproc) == NULL || *cp == '\0') { + if (!(cp = ct->c_storeproc) || !*cp) { CI ci = &ct->c_ctinfo; snprintf(buffer, sizeof(buffer), "%s-store-%s/%s", @@ -939,7 +805,7 @@ store_content(CT ct, CT p) ** content to standard input of a command and return. */ if (buffer[0] == '|' || buffer[0] == '!') - return show_content_aux(ct, 1, 0, buffer + 1, dir); + return show_content_aux(ct, 0, buffer + 1, dir); /* record the filename */ ct->c_storage = getcpy(buffer); @@ -1022,8 +888,8 @@ output_content_file(CT ct, int appending) FILE *fp; /* - ** If the pathname is absolute, make sure - ** all the relevant directories exist. + ** If the pathname contains directories, make sure + ** all of them exist. */ if (strchr(ct->c_storage, '/') && make_intermediates(ct->c_storage) == NOTOK) @@ -1368,41 +1234,6 @@ raw: /* -** Check if the content specifies a filename -** in its MIME parameters. -*/ - -static void -get_storeproc(CT ct) -{ - char **ap, **ep, *cp; - CI ci = &ct->c_ctinfo; - - /* - ** If the storeproc has already been defined, - ** we just return (for instance, if this content - ** is part of a "message/external". - */ - if (ct->c_storeproc) - return; - - /* - ** Check the attribute/value pairs, for the attribute "name". - ** If found, do a few sanity checks and copy the value into - ** the storeproc. - */ - for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) { - if (!mh_strcasecmp(*ap, "name") && *(cp = *ep) != '/' && - *cp != '.' && *cp != '|' && *cp != '!' && - !strchr(cp, '%')) { - ct->c_storeproc = getcpy(cp); - return; - } - } -} - - -/* ** Copy some of the header fields of the initial message/partial ** message into the header of the reassembled message. */