X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/122129da83e4e9ec2d0363ef9f60d32491af2629..b46d49ba:/uip/mhbuildsbr.c?ds=sidebyside diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c index c72bd818..ba96ac44 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,18 @@ #include #include #include +#include #include #include +#include "h/done.h" #include +#include "h/mhcachesbr.h" +#include "mhmisc.h" +#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 +43,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,24 +57,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 *, ...); - -/* 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,14 +124,14 @@ 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; CT ct; FILE *in; HF hp; - m_getfld_state_t gstate = 0; + m_getfld_state_t gstate; struct attach_list *attach_head = NULL, *attach_tail = NULL, *at_entry; convert_list *convert_head = NULL, *convert_tail = NULL, *convert; @@ -175,10 +160,11 @@ build_mime (char *infile, int autobuild, int dist, int directives, * draft into the linked list of header fields for * the new MIME message. */ - m_getfld_track_filepos (&gstate, in); + gstate = m_getfld_state_init(in); + m_getfld_track_filepos2(&gstate); for (compnum = 1;;) { int bufsz = sizeof buf; - switch (state = m_getfld (&gstate, name, buf, &bufsz, in)) { + switch (state = m_getfld2(&gstate, name, buf, &bufsz)) { case FLD: case FLDPLUS: compnum++; @@ -190,28 +176,27 @@ 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 */ if (!strcasecmp (name, TYPE_FIELD)) { while (state == FLDPLUS) { bufsz = sizeof buf; - state = m_getfld (&gstate, name, buf, &bufsz, in); + state = m_getfld2(&gstate, name, buf, &bufsz); } goto finish_field; } /* 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) { bufsz = sizeof buf; - state = m_getfld (&gstate, name, buf, &bufsz, in); + state = m_getfld2(&gstate, name, buf, &bufsz); vp = add (buf, vp); /* add to previous value */ } @@ -255,14 +240,14 @@ build_mime (char *infile, int autobuild, int dist, int directives, attach_head = attach_tail = entry; } } else if (strncasecmp(MHBUILD_FILE_PSEUDOHEADER, np, - strlen (MHBUILD_FILE_PSEUDOHEADER)) == 0) { + LEN(MHBUILD_FILE_PSEUDOHEADER)) == 0) { /* E.g., * Nmh-mhbuild-file-text/calendar: /home/user/Mail/inbox/9 */ - char *type = np + strlen (MHBUILD_FILE_PSEUDOHEADER); + char *type = np + LEN(MHBUILD_FILE_PSEUDOHEADER); char *filename = vp; - /* vp should begin with a space because m_getfld() + /* vp should begin with a space because m_getfld2() includes the space after the colon in buf. */ while (isspace((unsigned char) *filename)) { ++filename; } /* Trim trailing newline and any other whitespace. */ @@ -295,14 +280,14 @@ build_mime (char *infile, int autobuild, int dist, int directives, free (vp); free (np); } else if (strncasecmp(MHBUILD_ARGS_PSEUDOHEADER, np, - strlen (MHBUILD_ARGS_PSEUDOHEADER)) == 0) { + LEN(MHBUILD_ARGS_PSEUDOHEADER)) == 0) { /* E.g., * Nmh-mhbuild-args-text/calendar: -reply accept */ - char *type = np + strlen (MHBUILD_ARGS_PSEUDOHEADER); + char *type = np + LEN(MHBUILD_ARGS_PSEUDOHEADER); char *argstring = vp; - /* vp should begin with a space because m_getfld() + /* vp should begin with a space because m_getfld2() includes the space after the colon in buf. */ while (isspace((unsigned char) *argstring)) { ++argstring; } /* Trim trailing newline and any other whitespace. */ @@ -344,7 +329,7 @@ finish_field: case BODY: fseek (in, (long) (-strlen (buf)), SEEK_CUR); - /* fall through */ + break; case FILEEOF: break; @@ -378,13 +363,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 +391,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) @@ -461,7 +446,7 @@ finish_field: CT *ctp; convert_list *next; - done = freects_done; + set_done(freects_done); /* In case there are multiple calls that land here, prevent leak. */ for (ctp = cts; ctp && *ctp; ++ctp) { free_content (*ctp); } @@ -578,8 +563,7 @@ finish_field: } else { if (*++cp == 0) adios (NULL, "giving up trying to find a unique delimiter string"); - else - (*cp)++; + (*cp)++; } } @@ -603,7 +587,7 @@ init_decoded_content (CT ct, const char *filename) ct->c_ceclosefnx = close_encoding; ct->c_cesizefnx = NULL; /* since unencoded */ ct->c_encoding = CE_7BIT; /* Seems like a reasonable default */ - ct->c_file = add(filename, NULL); + ct->c_file = mh_xstrdup(FENDNULL(filename)); return OK; } @@ -613,23 +597,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) { @@ -639,11 +626,9 @@ fgetstr (char *s, int n, FILE *stream) } else if (strcmp(s, "#pop\n") == 0) { directive_pop(); } else { - break; + return s; } } - - return s; } @@ -657,7 +642,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,16 +689,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)); @@ -723,7 +707,7 @@ user_content (FILE *in, char *buf, CT *ctp, const char *infilename) int i; if (headers >= 0 && do_direct() && uprf (buffer, DESCR_FIELD) - && buffer[i = strlen (DESCR_FIELD)] == ':') { + && buffer[i = LEN(DESCR_FIELD)] == ':') { headers = 1; again_descr: @@ -746,7 +730,7 @@ again_descr: } if (headers >= 0 && do_direct() && uprf (buffer, DISPO_FIELD) - && buffer[i = strlen (DISPO_FIELD)] == ':') { + && buffer[i = LEN(DISPO_FIELD)] == ':') { headers = 1; again_dispo: @@ -810,7 +794,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"); @@ -932,7 +916,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 { @@ -956,7 +940,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,14 +971,13 @@ use_forw: if (*cp == '+' || *cp == '@') { if (folder) adios (NULL, "only one folder per #forw directive"); - else - folder = pluspath (cp); + folder = pluspath (cp); } } /* 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); @@ -1039,7 +1022,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; @@ -1058,7 +1041,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; } @@ -1124,7 +1107,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; } @@ -1187,7 +1170,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; } @@ -1221,7 +1204,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; @@ -1239,7 +1222,7 @@ compose_content (CT ct, int verbose) default: if (!ce->ce_file) { pid_t child_id; - int i, xstdout, len, buflen; + int xstdout, len, buflen; char *bp, *cp; char *vec[4], buffer[BUFSIZ]; FILE *out; @@ -1253,7 +1236,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; @@ -1289,7 +1272,7 @@ compose_content (CT ct, int verbose) case 'F': /* %f, and stdout is not-redirected */ xstdout = 1; - /* and fall... */ + /* FALLTHRU */ case 'f': /* @@ -1339,8 +1322,7 @@ raw: if ((out = fopen (ce->ce_file, "w")) == NULL) adios (ce->ce_file, "unable to open for writing"); - for (i = 0; (child_id = fork()) == NOTOK && i > 5; i++) - sleep (5); + child_id = fork(); switch (child_id) { case NOTOK: adios ("fork", "unable to fork"); @@ -1353,7 +1335,7 @@ raw: execvp ("/bin/sh", vec); fprintf (stderr, "unable to exec "); perror ("/bin/sh"); - _exit (-1); + _exit(1); /* NOTREACHED */ default: @@ -1639,7 +1621,7 @@ scan_content (CT ct, size_t maxunencoded) } } - return (boundaryclash ? NOTOK : OK); + return boundaryclash ? NOTOK : OK; } @@ -1680,11 +1662,11 @@ 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 */ - len = strlen (TYPE_FIELD) + strlen (ci->ci_type) + len = LEN(TYPE_FIELD) + strlen (ci->ci_type) + strlen (ci->ci_subtype) + 3; extbody = ct->c_type == CT_MESSAGE && ct->c_subtype == MESSAGE_EXTERNAL; @@ -1726,10 +1708,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); } @@ -1737,7 +1721,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)) { @@ -1752,17 +1736,16 @@ 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) { vp = concat (" ", ct->c_dispo_type, NULL); - len = strlen(DISPO_FIELD) + strlen(vp) + 1; + len = LEN(DISPO_FIELD) + strlen(vp) + 1; np = output_params(len, ct->c_dispo_first, NULL, 0); vp = add(np, vp); vp = add("\n", vp); - if (np) - free(np); + free(np); add_header (ct, mh_xstrdup(DISPO_FIELD), vp); } @@ -1779,8 +1762,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); } @@ -1798,7 +1781,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; @@ -1807,7 +1790,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; @@ -1816,7 +1799,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; @@ -1825,7 +1808,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; @@ -1930,7 +1913,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"); @@ -1938,7 +1921,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; @@ -1985,7 +1968,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. */ @@ -2017,7 +2000,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: /* @@ -2035,8 +2018,7 @@ 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); + free(pm->pm_value); pm->pm_value = mh_xstrdup(simplename); break; } @@ -2070,13 +2052,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) @@ -2087,7 +2069,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 @@ -2218,7 +2200,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); @@ -2233,15 +2214,13 @@ 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 = mh_xstrdup(convert_command); @@ -2249,7 +2228,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); @@ -2258,27 +2237,12 @@ expand_pseudoheader (CT ct, CT *text_plain_ct, struct multipart *m, init_decoded_content (reply_ct, infile); 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); + free(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++) { @@ -2291,45 +2255,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) { @@ -2420,8 +2361,8 @@ extract_headers (CT ct, char *reply_file, FILE **reply_fp) { buffer[statbuf.st_size] = '\0'; /* Look for a header in the convert reply. */ - if (strncasecmp (buffer, TYPE_FIELD, strlen (TYPE_FIELD)) == 0 && - buffer[strlen (TYPE_FIELD)] == ':') { + if (strncasecmp (buffer, TYPE_FIELD, LEN(TYPE_FIELD)) == 0 && + buffer[LEN(TYPE_FIELD)] == ':') { if ((end_of_header = strstr (buffer, "\r\n\r\n"))) { end_of_header += 2; found_header = 1; @@ -2435,28 +2376,29 @@ extract_headers (CT ct, char *reply_file, FILE **reply_fp) { CT tmp_ct; char *tmp_file; FILE *tmp_f; - size_t n; + size_t n, written; /* Truncate buffer to just the C-T. */ *end_of_header = '\0'; 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; } /* Hack. Use parse_mime() to detect the type/subtype of the reply, which we'll use below. */ tmp_file = getcpy (m_mktemp2 (NULL, invo_name, NULL, NULL)); - if ((tmp_f = fopen (tmp_file, "w")) && - fwrite (buffer, 1, n, tmp_f) == n) { - fclose (tmp_f); - } else { + tmp_f = fopen(tmp_file, "w"); + if (!tmp_f) + goto failed_to_extract_ct; + written = fwrite(buffer, 1, n, tmp_f); + fclose(tmp_f); + if (written != n) goto failed_to_extract_ct; - } - tmp_ct = parse_mime (tmp_file); + tmp_ct = parse_mime (tmp_file); if (tmp_ct) { /* The type and subtype were detected from the reply using parse_mime() above. */