X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhstore.c;h=259acf3902d6c7ed9d1279de897d19a4e21e65e6;hp=ed36c9603075083f7c61ea7cf326649d907c5183;hb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a;hpb=d1fefd9f614e4dc3cda16da6c69133c1b2005269 diff --git a/uip/mhstore.c b/uip/mhstore.c index ed36c96..259acf3 100644 --- a/uip/mhstore.c +++ b/uip/mhstore.c @@ -29,7 +29,7 @@ static struct swit switches[] = { #define TYPESW 4 { "type content", 0 }, #define VERSIONSW 5 - { "version", 0 }, + { "Version", 0 }, #define HELPSW 6 { "help", 0 }, #define DEBUGSW 7 @@ -71,7 +71,7 @@ void freects_done(int) NORETURN; */ static void pipeser(int); -int autosw = 0; +int autosw = 1; /* ** Cache of current directory. This must be @@ -106,7 +106,6 @@ int show_content_aux(CT, 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); @@ -115,7 +114,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 *); @@ -384,8 +382,6 @@ store_all_messages(CT *cts) ** Check for the directory in which to ** store any contents. */ - if (autosw) - dir = getcpy(cwd); if ((cp = context_find(nmhstorage)) && *cp) dir = getcpy(cp); else @@ -450,9 +446,6 @@ store_switch(CT ct) break; case CT_APPLICATION: - return store_application(ct); - break; - case CT_TEXT: case CT_AUDIO: case CT_IMAGE: @@ -471,84 +464,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; } } @@ -685,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(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(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; } @@ -816,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", @@ -955,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) @@ -1301,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. */