X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhstore.c;h=74442ad5a4fb6fc32d655868f3993ae9dbee3655;hp=6f6746debf8ba2e56b35906d1db086649d61a78a;hb=2abb9a7cfb0930e27062088734d306e7d78e4cc2;hpb=3410b680416c49a7617491af38bc1929855a331d diff --git a/uip/mhstore.c b/uip/mhstore.c index 6f6746d..74442ad 100644 --- a/uip/mhstore.c +++ b/uip/mhstore.c @@ -10,18 +10,20 @@ #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 }, + { "noauto", 2 }, #define FILESW 2 /* interface from show */ { "file file", 0 }, #define PARTSW 3 @@ -29,7 +31,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 @@ -64,7 +66,7 @@ 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 @@ -130,11 +132,11 @@ main(int argc, char **argv) CT ct, *ctp; FILE *fp; - done=freects_done; + if (atexit(freects_done) != 0) { + adios(NULL, "atexit failed"); + } -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ @@ -151,17 +153,17 @@ main(int argc, char **argv) switch (smatch(++cp, switches)) { case AMBIGSW: ambigsw(cp, switches); - done(1); + exit(1); case UNKWNSW: adios(NULL, "-%s unknown", cp); case HELPSW: snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name); print_help(buf, switches, 1); - done(1); + exit(0); case VERSIONSW: print_version(invo_name); - done(1); + exit(0); case AUTOSW: autosw++; @@ -288,7 +290,7 @@ main(int argc, char **argv) /* 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(1); seq_setprev(mp); /* set the previous-sequence */ if (!(cts = (CT *) calloc((size_t) (mp->numsel + 1), @@ -308,7 +310,7 @@ main(int argc, char **argv) } if (!*cts) - done(1); + exit(1); userrs = 1; SIGNAL(SIGQUIT, quitser); @@ -349,8 +351,7 @@ main(int argc, char **argv) context_save(); /* save the context file */ } - done(0); - return 1; + return 0; } @@ -364,7 +365,7 @@ pipeser(int i) fflush(stderr); } - done(1); + exit(1); /* NOTREACHED */ } @@ -466,34 +467,34 @@ store_switch(CT ct) ** Generic routine to store a MIME content. ** (application, audio, video, image, text, message/rfc922) */ - static int store_generic(CT ct) { - char **ap, **ep, *cp; + char **ap, **vp, *cp; CI ci = &ct->c_ctinfo; /* ** 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). - ** The storeproc may already be defined, if this content - ** is part of a "message/external", for instance. */ - if (autosw && ct->c_type != CT_MESSAGE && !ct->c_storeproc) { + if (autosw && ct->c_type != CT_MESSAGE) { /* ** Check the attribute/value pairs, for the attribute "name". - ** If found, do a few sanity checks and copy the value into - ** the storeproc. + ** If found, take the basename, do a few sanity checks and + ** copy the value into c_storeproc. */ - for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) { - if (mh_strcasecmp(*ap, "name")==0 && - *(cp = *ep) != '/' && *cp != '.' && - *cp != '|' && *cp != '!' && + for (ap = ci->ci_attrs, vp = ci->ci_values; *ap; ap++,vp++) { + if (mh_strcasecmp(*ap, "name")!=0) { + continue; + } + cp = mhbasename(*vp); + if (*cp && *cp!='.' && *cp!='|' && *cp!='!' && !strchr(cp, '%')) { + /* filename looks good: use it */ ct->c_storeproc = getcpy(cp); - break; } + break; } } @@ -630,48 +631,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; } @@ -761,7 +750,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", @@ -900,8 +889,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)