X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/758f572ffb029c2ccda464f86822724e1af7062b..e35fb433:/uip/mhbuildsbr.c?ds=inline diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c index e34dd978..4af6e590 100644 --- a/uip/mhbuildsbr.c +++ b/uip/mhbuildsbr.c @@ -22,9 +22,11 @@ #include #include #include -#include "../sbr/m_mktemp.h" -#include "../sbr/message_id.h" -#include "../sbr/mime_type.h" +#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" @@ -55,12 +57,6 @@ typedef struct convert_list { } convert_list; -/* mhmisc.c */ -void content_error (char *, CT, char *, ...); - -/* mhcachesbr.c */ -int find_cache (CT, int, int *, char *, char *, int); - /* * static prototypes */ @@ -134,7 +130,7 @@ build_mime (char *infile, int autobuild, int dist, int directives, 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; @@ -163,10 +159,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++; @@ -186,7 +183,7 @@ build_mime (char *infile, int autobuild, int dist, int directives, 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; } @@ -198,7 +195,7 @@ build_mime (char *infile, int autobuild, int dist, int directives, /* 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 */ } @@ -242,14 +239,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. */ @@ -282,14 +279,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. */ @@ -565,8 +562,7 @@ finish_field: } else { if (*++cp == 0) adios (NULL, "giving up trying to find a unique delimiter string"); - else - (*cp)++; + (*cp)++; } } @@ -590,7 +586,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; } @@ -710,7 +706,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: @@ -733,7 +729,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: @@ -974,8 +970,7 @@ use_forw: if (*cp == '+' || *cp == '@') { if (folder) adios (NULL, "only one folder per #forw directive"); - else - folder = pluspath (cp); + folder = pluspath (cp); } } @@ -1226,7 +1221,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; @@ -1326,8 +1321,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"); @@ -1671,7 +1665,7 @@ build_headers (CT ct, int header_encoding) 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; @@ -1746,7 +1740,7 @@ build_headers (CT ct, int header_encoding) 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); @@ -2242,9 +2236,9 @@ 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); inform("failed to extract headers from convert output in %s, " "continuing...", reply_file); + free(reply_file); return; } @@ -2366,8 +2360,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; @@ -2381,7 +2375,7 @@ 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'; @@ -2395,14 +2389,15 @@ extract_headers (CT ct, char *reply_file, FILE **reply_fp) { /* 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. */