X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhstore.c;h=47b7c025075ffff66a6cdf4e98ae6471c71cdaf5;hp=992d429338679f79fe69b0051325eece15987f9b;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=94c80042eae3383c812d9552089953f9846b1bb6 diff --git a/uip/mhstore.c b/uip/mhstore.c index 992d429..47b7c02 100644 --- a/uip/mhstore.c +++ b/uip/mhstore.c @@ -10,18 +10,21 @@ #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 }, + { "noauto", 2 }, #define FILESW 2 /* interface from show */ { "file file", 0 }, #define PARTSW 3 @@ -29,7 +32,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 @@ -37,6 +40,7 @@ static struct swit switches[] = { { NULL, 0 } }; +char *version=VERSION; /* mhparse.c */ extern char *tmp; /* directory to place temp files */ @@ -64,14 +68,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 @@ -114,7 +118,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 *); @@ -131,11 +134,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 */ @@ -152,17 +155,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++; @@ -173,27 +176,27 @@ main(int argc, char **argv) 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)); + file = *cp == '-' ? cp : mh_xstrdup(expanddir(cp)); continue; case DEBUGSW: @@ -203,9 +206,9 @@ main(int argc, char **argv) } 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)); + folder = mh_xstrdup(expandfol(cp)); } else app_msgarg(&msgs, cp); } @@ -240,7 +243,7 @@ main(int argc, char **argv) /* ** Cache the current directory before we do any chdirs()'s. */ - cwd = getcpy(pwd()); + cwd = mh_xstrdup(pwd()); /* ** Check for storage directory. If specified, @@ -250,17 +253,16 @@ main(int argc, char **argv) if ((cp = context_find(nmhstorage)) && *cp) tmp = concat(cp, "/", invo_name, NULL); else - tmp = getcpy(toabsdir(invo_name)); + tmp = mh_xstrdup(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 = mh_xcalloc(2, sizeof(*cts)); ctp = cts; if ((ct = parse_mime(file))) @@ -276,25 +278,23 @@ main(int argc, char **argv) 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 = mh_xcalloc(mp->numsel + 1, sizeof(*cts)); ctp = cts; for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) { @@ -309,7 +309,7 @@ main(int argc, char **argv) } if (!*cts) - done(1); + exit(EX_SOFTWARE); userrs = 1; SIGNAL(SIGQUIT, quitser); @@ -339,8 +339,7 @@ main(int argc, char **argv) for (ctp = cts; *ctp; ctp++) free_content(*ctp); - free((char *) cts); - cts = NULL; + mh_free0(&cts); /* If reading from a folder, do some updating */ if (mp) { @@ -350,8 +349,7 @@ main(int argc, char **argv) context_save(); /* save the context file */ } - done(0); - return 1; + return 0; } @@ -363,9 +361,10 @@ pipeser(int i) fflush(stdout); fprintf(stderr, "\n"); fflush(stderr); + exit(EX_TEMPFAIL); } - done(1); + exit(EX_IOERR); /* NOTREACHED */ } @@ -383,12 +382,10 @@ 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); + dir = mh_xstrdup(cp); else - dir = getcpy(cwd); + dir = mh_xstrdup(cwd); for (ctp = cts; *ctp; ctp++) { ct = *ctp; @@ -457,7 +454,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; } @@ -469,18 +466,50 @@ 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, **vp, *cp, *filename; + CI ci = &ct->c_ctinfo; + /* - ** Check if the content specifies a filename. + ** Check if the content specifies a filename in its MIME parameters. ** Don't bother with this for type "message" - ** (only "message/rfc822" will use store_generic). + ** (only the "message" subtype "rfc822" will use store_generic). */ - if (autosw && ct->c_type != CT_MESSAGE) - get_storeproc(ct); + if (autosw && ct->c_type != CT_MESSAGE) { + /* First check for "filename" in Content-Disposition header */ + filename = extract_name_value("filename", ct->c_dispo); + if (filename && strcmp(filename, ct->c_dispo)!=0) { + /* We found "filename" */ + cp = mhbasename(filename); + if (*cp && *cp!='.' && *cp!='|' && *cp!='!' && + !strchr(cp, '%')) { + /* filename looks good: use it */ + ct->c_storeproc = mh_xstrdup(cp); + goto finished; + } + } + /* + ** 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; + } + cp = mhbasename(*vp); + if (*cp && *cp!='.' && *cp!='|' && *cp!='!' && + !strchr(cp, '%')) { + /* filename looks good: use it */ + ct->c_storeproc = mh_xstrdup(cp); + } + break; + } + } +finished: return store_content(ct, NULL); } @@ -551,8 +580,7 @@ store_partial(CT ct) return NOTOK; } - if ((base = (CT *) calloc((size_t) (i + 1), sizeof(*base))) == NULL) - adios(NULL, "out of memory"); + base = mh_xcalloc(i + 1, sizeof(*base)); ctq = base; for (ctp = cts; *ctp; ctp++) { @@ -598,7 +626,7 @@ missing_part: ct = *ctq++; if (store_content(ct, NULL) == NOTOK) { losing: - free((char *) base); + mh_free0(&base); return NOTOK; } @@ -608,54 +636,42 @@ losing: goto losing; } - free((char *) base); + mh_free0(&base); return OK; } /* -** 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; + char **ap, **ep; + char *msg; + FILE *fp; + char buf[BUFSIZ]; - /* - ** Check if the parameters for the external body - ** specified a filename. - */ - if (autosw) { - char *cp; - - 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; } @@ -726,11 +742,11 @@ store_content(CT ct, CT p) */ if (p) { appending = 1; - ct->c_storage = getcpy(p->c_storage); + ct->c_storage = mh_xstrdup(p->c_storage); /* record the folder name */ if (p->c_folder) { - ct->c_folder = getcpy(p->c_folder); + ct->c_folder = mh_xstrdup(p->c_folder); } goto got_filename; } @@ -745,7 +761,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", @@ -770,11 +786,11 @@ store_content(CT ct, CT p) /* Store content in temporary file for now */ tmpfilenam = m_mktemp(invo_name, NULL, NULL); - ct->c_storage = getcpy(tmpfilenam); + ct->c_storage = mh_xstrdup(tmpfilenam); /* Get the folder name */ if (cp[1]) - folder = getcpy(expandfol(cp)); + folder = mh_xstrdup(expandfol(cp)); else folder = getcurfol(); @@ -782,10 +798,10 @@ store_content(CT ct, CT p) create_folder(toabsdir(folder), 0, exit); /* Record the folder name */ - ct->c_folder = getcpy(folder); + ct->c_folder = mh_xstrdup(folder); if (cp[1]) - free(folder); + mh_free0(&folder); goto got_filename; } @@ -804,7 +820,7 @@ store_content(CT ct, CT p) return show_content_aux(ct, 0, buffer + 1, dir); /* record the filename */ - ct->c_storage = getcpy(buffer); + ct->c_storage = mh_xstrdup(buffer); got_filename: /* flush the output stream */ @@ -884,8 +900,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) @@ -1230,41 +1246,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. */