X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/f139ce94a95fd895d8b4b74826660ab076ed5129..d205d39a:/uip/mhbuildsbr.c diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c index df346fec..501bb88b 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; @@ -204,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) { @@ -343,7 +331,7 @@ finish_field: case BODY: fseek (in, (long) (-strlen (buf)), SEEK_CUR); - /* fall through */ + break; case FILEEOF: break; @@ -377,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. */ @@ -405,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) @@ -621,7 +609,7 @@ fgetstr (char *s, int n, FILE *stream) if (!fgets (cp, n, stream)) return cp == s ? NULL : s; /* "\\\nEOF" ignored. */ - if (cp == s && *cp != '#') + if (! do_direct() || (cp == s && *cp != '#')) return s; /* Plaintext line. */ len = strlen(cp); @@ -657,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; @@ -704,7 +692,7 @@ 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] == '<')) { @@ -809,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"); @@ -931,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 { @@ -955,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; } @@ -993,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); @@ -1038,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; @@ -1057,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; } @@ -1123,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; } @@ -1186,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; } @@ -1220,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; @@ -1252,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; @@ -1288,7 +1276,7 @@ compose_content (CT ct, int verbose) case 'F': /* %f, and stdout is not-redirected */ xstdout = 1; - /* and fall... */ + /* FALLTHRU */ case 'f': /* @@ -1679,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 */ @@ -1725,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); } @@ -1736,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)) { @@ -1751,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) { @@ -1777,8 +1767,8 @@ 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); } @@ -1796,7 +1786,7 @@ skip_headers: 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; @@ -1805,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; @@ -1814,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; @@ -1823,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; @@ -1983,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. */ @@ -2015,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: /* @@ -2067,13 +2057,13 @@ 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); } if (!cp) @@ -2084,7 +2074,7 @@ set_disposition (CT ct) { /* * 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 @@ -2237,7 +2227,7 @@ expand_pseudoheader (CT ct, CT *text_plain_ct, struct multipart *m, /* 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, + concat (convert, " ", FENDNULL(argstring), " >", reply_file, NULL); /* Convert here . . . */ @@ -2246,7 +2236,7 @@ expand_pseudoheader (CT ct, CT *text_plain_ct, struct multipart *m, 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); @@ -2256,9 +2246,8 @@ 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; } @@ -2269,7 +2258,7 @@ expand_pseudoheader (CT ct, CT *text_plain_ct, struct multipart *m, if ((fd = open (reply_file, O_RDONLY)) == NOTOK || scan_input (fd, &eightbit) == NOTOK) { free (reply_file); - admonish (NULL, "failed to read %s", reply_file); + inform("failed to read %s, continuing...", reply_file); return; } (void) close (fd); @@ -2438,7 +2427,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; }