X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/81c57383273bb818858b2d7e6fdb4bbdb5df70d7..a3724ed39:/uip/mhbuildsbr.c diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c index eb899d25..e34dd978 100644 --- a/uip/mhbuildsbr.c +++ b/uip/mhbuildsbr.c @@ -1,6 +1,4 @@ - -/* - * mhbuildsbr.c -- routines to expand/translate MIME composition files +/* mhbuildsbr.c -- routines to expand/translate MIME composition files * * This code is Copyright (c) 2002, by the authors of nmh. See the * COPYRIGHT file in the root directory of the nmh distribution for @@ -20,9 +18,15 @@ #include #include #include +#include #include #include #include +#include "../sbr/m_mktemp.h" +#include "../sbr/message_id.h" +#include "../sbr/mime_type.h" +#include "mhfree.h" +#include "mhshowsbr.h" #ifdef HAVE_SYS_TIME_H # include @@ -36,10 +40,6 @@ extern int listsw; extern int rfc934sw; extern int contentidsw; -/* cache policies */ -extern int rcachesw; /* mhcachesbr.c */ -extern int wcachesw; /* mhcachesbr.c */ - static char prefix[] = "----- =_aaaaaaaaaa"; struct attach_list { @@ -54,12 +54,6 @@ typedef struct convert_list { struct convert_list *next; } convert_list; -/* - * Maximum size of URL token in message/external-body - */ - -#define MAXURLTOKEN 40 - /* mhmisc.c */ void content_error (char *, CT, char *, ...); @@ -67,12 +61,6 @@ void content_error (char *, CT, char *, ...); /* mhcachesbr.c */ int find_cache (CT, int, int *, char *, char *, int); -/* mhfree.c */ -extern CT *cts; -void freects_done (int) NORETURN; -void free_ctinfo (CT); -void free_encoding (CT, int); - /* * static prototypes */ @@ -139,7 +127,7 @@ build_mime (char *infile, int autobuild, int dist, int directives, int header_encoding, size_t maxunencoded, int verbose) { int compnum, state; - char buf[BUFSIZ], name[NAMESZ]; + char buf[NMH_BUFSIZ], name[NAMESZ]; char *cp, *np, *vp; struct multipart *m; struct part **pp; @@ -190,9 +178,8 @@ build_mime (char *infile, int autobuild, int dist, int directives, fclose(in); free (ct); return NULL; - } else { - adios (NULL, "draft shouldn't contain %s: field", name); } + adios (NULL, "draft shouldn't contain %s: field", name); } /* ignore any Content-Type fields in the header */ @@ -205,8 +192,8 @@ build_mime (char *infile, int autobuild, int dist, int directives, } /* get copies of the buffers */ - np = add (name, NULL); - vp = add (buf, NULL); + np = mh_xstrdup(name); + vp = mh_xstrdup(buf); /* if necessary, get rest of field */ while (state == FLDPLUS) { @@ -243,8 +230,8 @@ build_mime (char *infile, int autobuild, int dist, int directives, goto finish_field; } - entry = mh_xmalloc(sizeof(*entry)); - entry->filename = getcpy(s); + NEW(entry); + entry->filename = mh_xstrdup(s); entry->next = NULL; free(vp); @@ -277,12 +264,12 @@ build_mime (char *infile, int autobuild, int dist, int directives, adios (NULL, "Multiple %s headers with different files" " not allowed", type); } else { - convert->filename = getcpy (filename); + convert->filename = mh_xstrdup(filename); } } else { NEW0(convert); - convert->filename = getcpy (filename); - convert->type = getcpy (type); + convert->filename = mh_xstrdup(filename); + convert->type = mh_xstrdup(type); if (convert_tail) { convert_tail->next = convert; @@ -317,12 +304,12 @@ build_mime (char *infile, int autobuild, int dist, int directives, adios (NULL, "Multiple %s headers with different " "argstrings not allowed", type); } else { - convert->argstring = getcpy (argstring); + convert->argstring = mh_xstrdup(argstring); } } else { NEW0(convert); - convert->type = getcpy (type); - convert->argstring = getcpy (argstring); + convert->type = mh_xstrdup(type); + convert->argstring = mh_xstrdup(argstring); if (convert_tail) { convert_tail->next = convert; @@ -344,7 +331,7 @@ finish_field: case BODY: fseek (in, (long) (-strlen (buf)), SEEK_CUR); - /* fall through */ + break; case FILEEOF: break; @@ -378,13 +365,13 @@ finish_field: */ if (! dist) { - np = add (VRSN_FIELD, NULL); + np = mh_xstrdup(VRSN_FIELD); vp = concat (" ", VRSN_VALUE, "\n", NULL); add_header (ct, np, vp); } /* - * We initally assume we will find multiple contents in the + * We initially assume we will find multiple contents in the * draft. So create a multipart/mixed content to hold everything. * We can remove this later, if it is not needed. */ @@ -406,7 +393,7 @@ finish_field: CT p; if (user_content (in, buf, &p, infile) == DONE) { - admonish (NULL, "ignoring spurious #end"); + inform("ignoring spurious #end, continuing..."); continue; } if (!p) @@ -510,7 +497,7 @@ finish_field: * 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_cefile.ce_file = mh_xstrdup("/dev/null"); p->c_begin = ftell(in); p->c_end = ftell(in); @@ -560,6 +547,13 @@ finish_field: if ((cp = strchr(prefix, 'a')) == NULL) adios (NULL, "internal error(4)"); + /* + * If using EAI, force 8-bit charset. + */ + if (header_encoding == CE_8BIT) { + set_charset (ct, 1); + } + /* * Scan the contents. Choose a transfer encoding, and * check if prefix for multipart boundary clashes with @@ -606,23 +600,26 @@ static char * fgetstr (char *s, int n, FILE *stream) { char *cp, *ep; - int o_n = n; + ep = s + n; while(1) { - for (ep = (cp = s) + o_n; cp < ep; ) { - int i; + for (cp = s; cp < ep;) { + int len; if (!fgets (cp, n, stream)) - return (cp != s ? s : NULL); + return cp == s ? NULL : s; /* "\\\nEOF" ignored. */ - if (cp == s && *cp != '#') - return s; + if (! do_direct() || (cp == s && *cp != '#')) + return s; /* Plaintext line. */ - cp += (i = strlen (cp)) - 1; - if (i <= 1 || *cp-- != '\n' || *cp != '\\') + len = strlen(cp); + if (len <= 1) + break; /* Can't contain "\\\n". */ + cp += len - 1; /* Just before NUL. */ + if (*cp-- != '\n' || *cp != '\\') break; - *cp = '\0'; - n -= (i - 2); + *cp = '\0'; /* Erase the trailing "\\\n". */ + n -= (len - 2); } if (strcmp(s, "#on\n") == 0) { @@ -632,11 +629,9 @@ fgetstr (char *s, int n, FILE *stream) } else if (strcmp(s, "#pop\n") == 0) { directive_pop(); } else { - break; + return s; } } - - return s; } @@ -650,7 +645,7 @@ user_content (FILE *in, char *buf, CT *ctp, const char *infilename) { int extrnal, vrsn; char *cp, **ap; - char buffer[BUFSIZ]; + char buffer[NMH_BUFSIZ]; struct multipart *m; struct part **pp; struct stat st; @@ -697,16 +692,15 @@ user_content (FILE *in, char *buf, CT *ctp, const char *infilename) } /* use a temp file to collect the plain text lines */ - ce->ce_file = add (cp, NULL); + ce->ce_file = mh_xstrdup(cp); ce->ce_unlink = 1; if (do_direct() && (buf[0] == '#' && buf[1] == '<')) { strncpy (content, buf + 2, sizeof(content)); inlineD = 1; goto rock_and_roll; - } else { - inlineD = 0; } + inlineD = 0; /* the directive is implicit */ strncpy (content, "text/plain", sizeof(content)); @@ -803,7 +797,7 @@ rock_and_roll: ct->c_encoding = CE_7BIT; goto call_init; } - /* else fall... */ + /* FALLTHRU */ case CT_MULTIPART: adios (NULL, "it doesn't make sense to define an in-line %s content", ct->c_type == CT_MESSAGE ? "message" : "multipart"); @@ -925,7 +919,7 @@ use_forw: continue; if (!*cp) adios (NULL, "empty pipe command for #%s directive", ci->ci_type); - cp = add (cp, NULL); + cp = mh_xstrdup(cp); free (ci->ci_magic); ci->ci_magic = cp; } else { @@ -949,7 +943,7 @@ use_forw: content_error (NULL, ct, "don't know how to compose content"); done (1); } - ci->ci_magic = add (cp, NULL); + ci->ci_magic = mh_xstrdup(cp); return OK; } @@ -987,7 +981,7 @@ use_forw: /* else, use the current folder */ if (!folder) - folder = add (getfolder (1), NULL); + folder = mh_xstrdup(getfolder(1)); if (!(mp = folder_read (folder, 0))) adios (NULL, "unable to read folder %s", folder); @@ -1032,7 +1026,7 @@ use_forw: p->c_subtype = MESSAGE_RFC822; snprintf (buffer, sizeof(buffer), "%s/%d", mp->foldpath, msgnum); - pe->ce_file = add (buffer, NULL); + pe->ce_file = mh_xstrdup(buffer); if (listsw && stat (pe->ce_file, &st) != NOTOK) p->c_end = (long) st.st_size; @@ -1051,7 +1045,7 @@ use_forw: msgnum = mp->lowsel; snprintf (buffer, sizeof(buffer), "%s/%d", mp->foldpath, msgnum); - ce->ce_file = add (buffer, NULL); + ce->ce_file = mh_xstrdup(buffer); if (listsw && stat (ce->ce_file, &st) != NOTOK) ct->c_end = (long) st.st_size; } @@ -1117,7 +1111,7 @@ use_forw: pp = &part->mp_next; part->mp_part = p; } - admonish (NULL, "premature end-of-file, missing #end"); + inform("premature end-of-file, missing #end, continuing..."); return OK; } @@ -1141,10 +1135,10 @@ set_id (CT ct, int top) time (&clock); snprintf (contentid, sizeof(contentid), "%s\n", message_id (clock, 1)); partno = 0; - msgfmt = getcpy(contentid); + msgfmt = mh_xstrdup(contentid); } snprintf (contentid, sizeof(contentid), msgfmt, top ? 0 : ++partno); - ct->c_id = getcpy (contentid); + ct->c_id = mh_xstrdup(contentid); } @@ -1180,7 +1174,7 @@ compose_content (CT ct, int verbose) CT p = part->mp_part; sprintf (pp, "%d", partnum); - p->c_partno = add (partnam, NULL); + p->c_partno = mh_xstrdup(partnam); if (compose_content (p, verbose) == NOTOK) return NOTOK; } @@ -1214,7 +1208,7 @@ compose_content (CT ct, int verbose) if (listsw) { ct->c_end = (partnum = strlen (prefix) + 2) + 2; if (ct->c_rfc934) - ct->c_end += 1; + ct->c_end++; for (part = m->mp_parts; part; part = part->mp_next) ct->c_end += part->mp_part->c_end + partnum; @@ -1246,7 +1240,7 @@ compose_content (CT ct, int verbose) adios("mhbuildsbr", "unable to create temporary file in %s", get_temp_dir()); } - ce->ce_file = add (tfile, NULL); + ce->ce_file = mh_xstrdup(tfile); ce->ce_unlink = 1; xstdout = 0; @@ -1282,7 +1276,7 @@ compose_content (CT ct, int verbose) case 'F': /* %f, and stdout is not-redirected */ xstdout = 1; - /* and fall... */ + /* FALLTHRU */ case 'f': /* @@ -1673,7 +1667,7 @@ build_headers (CT ct, int header_encoding) /* * output the content type and subtype */ - np = add (TYPE_FIELD, NULL); + np = mh_xstrdup(TYPE_FIELD); vp = concat (" ", ci->ci_type, "/", ci->ci_subtype, NULL); /* keep track of length of line */ @@ -1719,10 +1713,12 @@ build_headers (CT ct, int header_encoding) add_header (ct, np, vp); /* - * output the Content-ID, unless disabled by -nocontentid + * output the Content-ID, unless disabled by -nocontentid. Note that + * RFC 2045 always requires a Content-ID header for message/external-body + * entities. */ - if (contentidsw && ct->c_id) { - np = add (ID_FIELD, NULL); + if ((contentidsw || ct->c_ctexbody) && ct->c_id) { + np = mh_xstrdup(ID_FIELD); vp = concat (" ", ct->c_id, NULL); add_header (ct, np, vp); } @@ -1730,7 +1726,7 @@ build_headers (CT ct, int header_encoding) * output the Content-Description */ if (ct->c_descr) { - np = add (DESCR_FIELD, NULL); + np = mh_xstrdup(DESCR_FIELD); vp = concat (" ", ct->c_descr, NULL); if (header_encoding != CE_8BIT) { if (encode_rfc2047(DESCR_FIELD, &vp, header_encoding, NULL)) { @@ -1745,7 +1741,7 @@ build_headers (CT ct, int header_encoding) * set, then we need to build it. */ if (ct->c_dispo) { - np = add (DISPO_FIELD, NULL); + np = mh_xstrdup(DISPO_FIELD); vp = concat (" ", ct->c_dispo, NULL); add_header (ct, np, vp); } else if (ct->c_dispo_type) { @@ -1754,9 +1750,8 @@ build_headers (CT ct, int header_encoding) np = output_params(len, ct->c_dispo_first, NULL, 0); vp = add(np, vp); vp = add("\n", vp); - if (np) - free(np); - add_header (ct, getcpy(DISPO_FIELD), vp); + mh_xfree(np); + add_header (ct, mh_xstrdup(DISPO_FIELD), vp); } skip_headers: @@ -1772,21 +1767,26 @@ skip_headers: * output the Content-MD5 */ if (checksw) { - np = add (MD5_FIELD, NULL); - vp = calculate_digest (ct, (ct->c_encoding == CE_QUOTED) ? 1 : 0); + np = mh_xstrdup(MD5_FIELD); + vp = calculate_digest (ct, ct->c_encoding == CE_QUOTED); add_header (ct, np, vp); } /* * output the Content-Transfer-Encoding + * If using EAI and message body is 7-bit, force 8-bit C-T-E. */ + if (header_encoding == CE_8BIT && ct->c_encoding == CE_7BIT) { + ct->c_encoding = CE_8BIT; + } + switch (ct->c_encoding) { case CE_7BIT: /* Nothing to output */ break; case CE_8BIT: - np = add (ENCODING_FIELD, NULL); + np = mh_xstrdup(ENCODING_FIELD); vp = concat (" ", "8bit", "\n", NULL); add_header (ct, np, vp); break; @@ -1795,7 +1795,7 @@ skip_headers: if (ct->c_type == CT_MESSAGE || ct->c_type == CT_MULTIPART) adios (NULL, "internal error, invalid encoding"); - np = add (ENCODING_FIELD, NULL); + np = mh_xstrdup(ENCODING_FIELD); vp = concat (" ", "quoted-printable", "\n", NULL); add_header (ct, np, vp); break; @@ -1804,7 +1804,7 @@ skip_headers: if (ct->c_type == CT_MESSAGE || ct->c_type == CT_MULTIPART) adios (NULL, "internal error, invalid encoding"); - np = add (ENCODING_FIELD, NULL); + np = mh_xstrdup(ENCODING_FIELD); vp = concat (" ", "base64", "\n", NULL); add_header (ct, np, vp); break; @@ -1813,7 +1813,7 @@ skip_headers: if (ct->c_type == CT_MESSAGE) adios (NULL, "internal error, invalid encoding"); - np = add (ENCODING_FIELD, NULL); + np = mh_xstrdup(ENCODING_FIELD); vp = concat (" ", "binary", "\n", NULL); add_header (ct, np, vp); break; @@ -1918,7 +1918,7 @@ calculate_digest (CT ct, int asciiP) unsigned char *ep; fprintf (stderr, "MD5 digest="); - for (ep = (dp = digest) + sizeof(digest) / sizeof(digest[0]); + for (ep = (dp = digest) + sizeof digest; dp < ep; dp++) fprintf (stderr, "%02x", *dp & 0xff); fprintf (stderr, "\n"); @@ -1926,7 +1926,7 @@ calculate_digest (CT ct, int asciiP) /* encode the digest using base64 */ for (dp = digest, op = (char *) outbuf, - cc = sizeof(digest) / sizeof(digest[0]); + cc = sizeof digest; cc > 0; cc -= 3, op += 4) { unsigned long bits; char *bp; @@ -1973,7 +1973,7 @@ setup_attach_content(CT ct, char *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. + * since we're just feeding it a MIME type we have to add those ourselves. * Map that to a valid content-type label and call any initialization * function. */ @@ -2005,7 +2005,7 @@ setup_attach_content(CT ct, char *filename) if (strcasecmp(ct->c_ctinfo.ci_subtype, "external-body") == 0) adios(NULL, "external-body messages must be specified " "by mhbuild directives"); - /* Fall through */ + /* FALLTHRU */ default: /* @@ -2023,9 +2023,8 @@ setup_attach_content(CT ct, char *filename) for (pm = ct->c_ctinfo.ci_first_pm; pm; pm = pm->pm_next) { if (strcasecmp(pm->pm_name, "name") == 0) { - if (pm->pm_value) - free(pm->pm_value); - pm->pm_value = getcpy(simplename); + mh_xfree(pm->pm_value); + pm->pm_value = mh_xstrdup(simplename); break; } } @@ -2034,9 +2033,9 @@ setup_attach_content(CT ct, char *filename) add_param(&ct->c_ctinfo.ci_first_pm, &ct->c_ctinfo.ci_last_pm, "name", simplename, 0); - ct->c_descr = getcpy(simplename); + ct->c_descr = mh_xstrdup(simplename); ct->c_descr = add("\n", ct->c_descr); - ct->c_cefile.ce_file = getcpy(filename); + ct->c_cefile.ce_file = mh_xstrdup(filename); set_disposition (ct); @@ -2058,22 +2057,24 @@ set_disposition (CT ct) { if (cp && strcasecmp (cp, "attachment") && strcasecmp (cp, "inline")) { - admonish (NULL, "configuration problem: %s-disposition-%s%s%s " - "specifies '%s' but only 'attachment' and 'inline' are " - "allowed", invo_name, - ct->c_ctinfo.ci_type, - ct->c_ctinfo.ci_subtype ? "/" : "", - ct->c_ctinfo.ci_subtype ? ct->c_ctinfo.ci_subtype : "", - cp); + inform("configuration problem: %s-disposition-%s%s%s specifies " + "'%s' but only 'attachment' and 'inline' are allowed, " + "continuing...", invo_name, + ct->c_ctinfo.ci_type, + ct->c_ctinfo.ci_subtype ? "/" : "", + FENDNULL(ct->c_ctinfo.ci_subtype), + cp); } - ct->c_dispo_type = cp ? getcpy (cp) : getcpy ("attachment"); + if (!cp) + cp = "attachment"; + ct->c_dispo_type = mh_xstrdup(cp); } } /* * Set text content charset if it was unspecified. contains8bit - * selctions: + * selections: * 0: content does not contain 8-bit characters * 1: content contains 8-bit characters * -1: ignore content and use user's locale to determine charset @@ -2204,7 +2205,6 @@ expand_pseudoheader (CT ct, CT *text_plain_ct, struct multipart *m, struct str2init *s2i; CT reply_ct; struct part *part; - int eightbit = 0; int status; type_p = getcpy (type); @@ -2219,23 +2219,21 @@ expand_pseudoheader (CT ct, CT *text_plain_ct, struct multipart *m, free (type_p); if (! (convert)) { - /* No mhbuild-convert- entry in mhn.defaults or profile - for type. */ + /* No mhbuild-convert- entry in mhn.defaults or profile for type. */ return; } /* reply_file is used to pass the output of the convert. */ reply_file = getcpy (m_mktemp2 (NULL, invo_name, NULL, NULL)); convert_command = - concat (convert, " ", argstring ? argstring : "", " >", reply_file, - NULL); + concat (convert, " ", FENDNULL(argstring), " >", reply_file, NULL); /* Convert here . . . */ - ct->c_storeproc = getcpy (convert_command); + ct->c_storeproc = mh_xstrdup(convert_command); ct->c_umask = ~m_gmprot (); if ((status = show_content_aux (ct, 0, convert_command, NULL, NULL)) != OK) { - admonish (NULL, "store of %s content failed", type); + inform("store of %s content failed, continuing...", type); } free (convert_command); @@ -2245,26 +2243,11 @@ expand_pseudoheader (CT ct, CT *text_plain_ct, struct multipart *m, if (extract_headers (reply_ct, reply_file, &reply_fp) == NOTOK) { free (reply_file); - admonish (NULL, - "failed to extract headers from convert output in %s", - reply_file); + inform("failed to extract headers from convert output in %s, " + "continuing...", reply_file); return; } - /* For text content only, see if it is 8-bit text. */ - if (reply_ct->c_type == CT_TEXT) { - int fd; - - if ((fd = open (reply_file, O_RDONLY)) == NOTOK || - scan_input (fd, &eightbit) == NOTOK) { - free (reply_file); - admonish (NULL, "failed to read %s", reply_file); - return; - } else { - (void) close (fd); - } - } - /* This sets reply_ct->c_ctparams, and reply_ct->c_termproc if the charset can't be handled natively. */ for (s2i = str2cts; s2i->si_key; s2i++) { @@ -2277,45 +2260,22 @@ expand_pseudoheader (CT ct, CT *text_plain_ct, struct multipart *m, (*reply_ct->c_ctinitfnx)(reply_ct); } - if ((cp = - get_param (reply_ct->c_ctinfo.ci_first_pm, "charset", '?', 1))) { + if ((cp = get_param (reply_ct->c_ctinfo.ci_first_pm, "charset", '?', 1))) { /* The reply Content-Type had the charset. */ charset = cp; } else { set_charset (reply_ct, -1); charset = get_param (reply_ct->c_ctinfo.ci_first_pm, "charset", '?', 1); - if (reply_ct->c_reqencoding == CE_UNKNOWN && - reply_ct->c_type == CT_TEXT) { - /* Assume that 8bit is sufficient (for text). In other words, - don't allow it to be encoded as quoted printable if lines - are too long. This also sidesteps the check for whether - it needs to be encoded as binary; instead, it relies on - the applicable mhbuild-convert-text directive to ensure - that the resultant text is not binary. */ - reply_ct->c_reqencoding = eightbit ? CE_8BIT : CE_7BIT; - } } /* Concatenate text/plain parts. */ - if (reply_ct->c_type == CT_TEXT && - reply_ct->c_subtype == TEXT_PLAIN) { + if (reply_ct->c_type == CT_TEXT && reply_ct->c_subtype == TEXT_PLAIN) { if (! *text_plain_ct && m->mp_parts && m->mp_parts->mp_part && m->mp_parts->mp_part->c_type == CT_TEXT && m->mp_parts->mp_part->c_subtype == TEXT_PLAIN) { *text_plain_ct = m->mp_parts->mp_part; - /* Make sure that the charset is set in the text/plain - part. */ + /* Make sure that the charset is set in the text/plain part. */ set_charset (*text_plain_ct, -1); - if ((*text_plain_ct)->c_reqencoding == CE_UNKNOWN) { - /* Assume that 8bit is sufficient (for text). In other words, - don't allow it to be encoded as quoted printable if lines - are too long. This also sidesteps the check for whether - it needs to be encoded as binary; instead, it relies on - the applicable mhbuild-convert-text directive to ensure - that the resultant text is not binary. */ - (*text_plain_ct)->c_reqencoding = - eightbit ? CE_8BIT : CE_7BIT; - } } if (*text_plain_ct) { @@ -2428,7 +2388,7 @@ extract_headers (CT ct, char *reply_file, FILE **reply_fp) { n = strlen (buffer); if (get_ctinfo (buffer + 14, ct, 0) != OK) { - admonish (NULL, "unable to get content info for reply"); + inform("unable to get content info for reply, continuing..."); goto failed_to_extract_ct; }