X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/55f65ae2d3baf60396d3359db952460939de03ca..035c5db34:/uip/mhbuildsbr.c?ds=inline diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c index 8d3a76df..840f0467 100644 --- a/uip/mhbuildsbr.c +++ b/uip/mhbuildsbr.c @@ -52,6 +52,11 @@ pid_t xpid = 0; static char prefix[] = "----- =_aaaaaaaaaa"; +struct attach_list { + char *filename; + struct attach_list *next; +}; + /* * Maximum size of URL token in message/external-body */ @@ -69,17 +74,13 @@ int find_cache (CT, int, int *, char *, char *, int); void free_ctinfo (CT); void free_encoding (CT, int); -/* - * prototypes - */ -CT build_mime (char *, int); - /* * static prototypes */ static int init_decoded_content (CT); +static void setup_attach_content(CT, char *); static char *fgetstr (char *, int, FILE *); -static int user_content (FILE *, char *, char *, CT *); +static int user_content (FILE *, char *, CT *); static void set_id (CT, int); static int compose_content (CT); static int scan_content (CT); @@ -128,7 +129,8 @@ static void directive_pop(void) */ CT -build_mime (char *infile, int directives) +build_mime (char *infile, int autobuild, int dist, int directives, + int header_encoding) { int compnum, state; char buf[BUFSIZ], name[NAMESZ]; @@ -137,7 +139,9 @@ build_mime (char *infile, int directives) struct part **pp; CT ct; FILE *in; + HF hp; m_getfld_state_t gstate = 0; + struct attach_list *attach_head = NULL, *attach_tail = NULL, *at_entry; directive_init(directives); @@ -173,13 +177,16 @@ build_mime (char *infile, int directives) case FLDPLUS: compnum++; - /* abort if draft has Mime-Version header field */ - if (!strcasecmp (name, VRSN_FIELD)) - adios (NULL, "draft shouldn't contain %s: field", VRSN_FIELD); - - /* abort if draft has Content-Transfer-Encoding header field */ - if (!strcasecmp (name, ENCODING_FIELD)) - adios (NULL, "draft shouldn't contain %s: field", ENCODING_FIELD); + /* abort if draft has Mime-Version or C-T-E header field */ + if (strcasecmp (name, VRSN_FIELD) == 0 || + strcasecmp (name, ENCODING_FIELD) == 0) { + if (autobuild) { + fclose(in); + return NULL; + } else { + adios (NULL, "draft shouldn't contain %s: field", name); + } + } /* ignore any Content-Type fields in the header */ if (!strcasecmp (name, TYPE_FIELD)) { @@ -201,19 +208,54 @@ build_mime (char *infile, int directives) vp = add (buf, vp); /* add to previous value */ } - /* Now add the header data to the list */ - add_header (ct, np, vp); + /* + * Now add the header data to the list, unless it's an attach + * header; in that case, add it to our attach list + */ + + if (strcasecmp(ATTACH_FIELD, np) == 0) { + struct attach_list *entry; + char *s = vp, *e = vp + strlen(vp) - 1; + free(np); + + /* + * Make sure we can find the start of this filename. + * If it's blank, we skip completely. Otherwise, strip + * off any leading spaces and trailing newlines. + */ + + while (isspace((unsigned char) *s)) + s++; + + while (e > s && *e == '\n') + *e-- = '\0'; + + if (*s == '\0') { + free(vp); + goto finish_field; + } + + entry = mh_xmalloc(sizeof(*entry)); + entry->filename = getcpy(s); + free(vp); + if (attach_tail) { + attach_tail->next = entry; + attach_tail = entry; + } else { + attach_head = attach_tail = entry; + } + } else { + add_header (ct, np, vp); + } finish_field: /* if this wasn't the last header field, then continue */ continue; - case FILEEOF: - adios (NULL, "draft has empty body -- no directives!"); - /* NOTREACHED */ - case BODY: fseek (in, (long) (-strlen (buf)), SEEK_CUR); + /* fall through */ + case FILEEOF: break; case LENERR: @@ -227,13 +269,27 @@ finish_field: } m_getfld_state_destroy (&gstate); + /* + * Iterate through the list of headers and call the function to MIME-ify + * them if required. + */ + + for (hp = ct->c_first_hf; hp != NULL; hp = hp->next) { + if (encode_rfc2047(hp->name, &hp->value, header_encoding, NULL)) { + adios(NULL, "Unable to encode header \"%s\"", hp->name); + } + } + /* * Now add the MIME-Version header field * to the list of header fields. */ - np = add (VRSN_FIELD, NULL); - vp = concat (" ", VRSN_VALUE, "\n", NULL); - add_header (ct, np, vp); + + if (! dist) { + np = add (VRSN_FIELD, NULL); + vp = concat (" ", VRSN_VALUE, "\n", NULL); + add_header (ct, np, vp); + } /* * We initally assume we will find multiple contents in the @@ -259,7 +315,7 @@ finish_field: struct part *part; CT p; - if (user_content (in, infile, buf, &p) == DONE) { + if (user_content (in, buf, &p) == DONE) { admonish (NULL, "ignoring spurious #end"); continue; } @@ -273,16 +329,94 @@ finish_field: part->mp_part = p; } + /* + * Add any Attach headers to the list of MIME parts at the end of the + * message. + */ + + for (at_entry = attach_head; at_entry; ) { + struct attach_list *at_prev = at_entry; + struct part *part; + CT p; + + if (access(at_entry->filename, R_OK) != 0) { + adios("reading", "Unable to open %s for", at_entry->filename); + } + + if ((p = (CT) calloc (1, sizeof(*p))) == NULL) + adios(NULL, "out of memory"); + + init_decoded_content(p); + + /* + * Initialize our content structure based on the filename, + * and fill in all of the relevant fields. Also place MIME + * parameters in the attributes array. + */ + + setup_attach_content(p, at_entry->filename); + + if ((part = (struct part *) calloc (1, sizeof(*part))) == NULL) + adios (NULL, "out of memory"); + *pp = part; + pp = &part->mp_next; + part->mp_part = p; + + at_entry = at_entry->next; + free(at_prev->filename); + free(at_prev); + } + + /* + * To allow for empty message bodies, if we've found NO content at all + * yet cook up an empty text/plain part. + */ + + if (!m->mp_parts) { + CT p; + struct part *part; + struct text *t; + + if ((p = (CT) calloc (1, sizeof(*p))) == NULL) + adios(NULL, "out of memory"); + + init_decoded_content(p); + + if (get_ctinfo ("text/plain", p, 0) == NOTOK) + done (1); + + p->c_type = CT_TEXT; + p->c_subtype = TEXT_PLAIN; + p->c_encoding = CE_7BIT; + p->c_file = getcpy(infile); + /* + * Sigh. ce_file contains the "decoded" contents of this part. + * So this seems like the best option available since we're going + * to call scan_content() on this. + */ + p->c_cefile.ce_file = getcpy("/dev/null"); + p->c_begin = ftell(in); + p->c_end = ftell(in); + + if ((t = (struct text *) calloc (1, sizeof (*t))) == NULL) + adios (NULL, "out of memory"); + + t->tx_charset = CHARSET_SPECIFIED; + p->c_ctparams = t; + + if ((part = (struct part *) calloc (1, sizeof(*part))) == NULL) + adios (NULL, "out of memory"); + *pp = part; + pp = &part->mp_next; + part->mp_part = p; + } + /* * close the composition draft since * it's not needed any longer. */ fclose (in); - /* check if any contents were found */ - if (!m->mp_parts) - adios (NULL, "no content directives found"); - /* * If only one content was found, then remove and * free the outer multipart content. @@ -331,7 +465,8 @@ finish_field: } /* Build the rest of the header field structures */ - build_headers (ct); + if (! dist) + build_headers (ct); return ct; } @@ -397,7 +532,7 @@ fgetstr (char *s, int n, FILE *stream) */ static int -user_content (FILE *in, char *file, char *buf, CT *ctp) +user_content (FILE *in, char *buf, CT *ctp) { int extrnal, vrsn; char *cp, **ap; @@ -864,7 +999,7 @@ use_forw: struct part *part; CT p; - if (user_content (in, file, buffer, &p) == DONE) { + if (user_content (in, buffer, &p) == DONE) { if (!m->mp_parts) adios (NULL, "empty \"#begin ... #end\" sequence"); return OK; @@ -1702,3 +1837,104 @@ calculate_digest (CT ct, int asciiP) vp = concat (" ", outbuf, "\n", NULL); return vp; } + +/* + * Set things up for the content structure for file "filename" that + * we want to attach + */ + +static void +setup_attach_content(CT ct, char *filename) +{ + char *type, **ap, **ep, *simplename = r1bindex(filename, '/'); + struct str2init *s2i; + + if (! (type = mime_type(filename))) { + adios(NULL, "Unable to determine MIME type of \"%s\"", filename); + } + + /* + * Parse the Content-Type. get_ctinfo() parses MIME parameters, but + * since we're just feeding it a MIME type we have to add those ourself. + * Map that to a valid content-type label and call any initialization + * function. + */ + + if (get_ctinfo(type, ct, 0) == NOTOK) + done(1); + + free(type); + + for (s2i = str2cts; s2i->si_key; s2i++) + if (strcasecmp(ct->c_ctinfo.ci_type, s2i->si_key) == 0) + break; + if (!s2i->si_key && !uprf(ct->c_ctinfo.ci_type, "X-")) + s2i++; + + /* + * Make sure the type isn't incompatible with what we can handle + */ + + switch (ct->c_type = s2i->si_val) { + case CT_MULTIPART: + adios (NULL, "multipart types must be specified by mhbuild directives"); + /* NOTREACHED */ + + case CT_MESSAGE: + if (strcasecmp(ct->c_ctinfo.ci_subtype, "partial") == 0) + adios(NULL, "Sorry, %s/%s isn't supported", ct->c_ctinfo.ci_type, + ct->c_ctinfo.ci_subtype); + if (strcasecmp(ct->c_ctinfo.ci_subtype, "external-body") == 0) + adios(NULL, "external-body messages must be specified " + "by mhbuild directives"); + /* Fall through */ + + default: + /* + * This sets the subtype, if it's significant + */ + if ((ct->c_ctinitfnx = s2i->si_init)) + (*ct->c_ctinitfnx)(ct); + break; + } + + /* + * Feed in a few attributes; specifically, the name attribute, the + * content-description, and the content-disposition. + */ + + for (ap = ct->c_ctinfo.ci_attrs, ep = ct->c_ctinfo.ci_values; *ap; + ap++, ep++) { + if (strcasecmp(*ap, "name") == 0) { + if (*ep) + free(*ep); + *ep = getcpy(simplename); + break; + } + } + + if (*ap == NULL) { + *ap = getcpy("name"); + *ep = getcpy(simplename); + } + + ct->c_descr = getcpy(simplename); + ct->c_descr = add("\n", ct->c_descr); + ct->c_cefile.ce_file = getcpy(filename); + + /* + * If it's a text/calendar, we need to make sure it's an inline, + * otherwise it won't work with some calendar programs. Otherwise + * assume attachment + */ + + if (strcasecmp(ct->c_ctinfo.ci_type, "text") == 0 && + strcasecmp(ct->c_ctinfo.ci_subtype, "calendar") == 0) { + ct->c_dispo = getcpy("inline; filename=\""); + } else { + ct->c_dispo = getcpy("attachment; filename=\""); + } + + ct->c_dispo = add(simplename, ct->c_dispo); + ct->c_dispo = add("\"\n", ct->c_dispo); +}