X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/16959a4f1a98162369b9b0ca9cb890450410f2c7..6015bb1f7:/uip/mhfixmsg.c?ds=inline diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c index 2a701f00..88dfb153 100644 --- a/uip/mhfixmsg.c +++ b/uip/mhfixmsg.c @@ -1,5 +1,4 @@ -/* - * mhfixmsg.c -- rewrite a message with various transformations +/* mhfixmsg.c -- rewrite a message with various transformations * * This code is Copyright (c) 2002 and 2013, by the authors of nmh. * See the COPYRIGHT file in the root directory of the nmh @@ -7,10 +6,17 @@ */ #include +#include #include #include #include #include +#include "../sbr/m_maildir.h" +#include "../sbr/m_mktemp.h" +#include "../sbr/mime_type.h" +#include "mhfree.h" +#include "mhoutsbr.h" +#include "mhshowsbr.h" #include #define MHFIXMSG_SWITCHES \ @@ -62,15 +68,9 @@ extern int bogus_mp_content; /* flag from InitMultiPart */ /* flags to/from parse_header_attrs */ extern int suppress_extraneous_trailing_semicolon_warning; -/* mhoutsbr.c */ -int output_message_fp (CT, FILE *, char *); - /* mhmisc.c */ void flush_errors (void); -/* mhfree.c */ -extern CT *cts; - /* * static prototypes */ @@ -125,7 +125,8 @@ static int fix_filename_encoding (CT); static int write_content (CT, const char *, char *, FILE *, int, int); static void set_text_ctparams(CT, char *, int); static int remove_file (const char *); -static void report (char *, char *, char *, char *, ...); +static void report (char *, char *, char *, char *, ...) + CHECK_PRINTF(4, 5); static void pipeser (int); @@ -232,11 +233,10 @@ main (int argc, char **argv) { adios (NULL, "missing argument to %s", argp[-2]); } if (! strncasecmp (cp, "multipart/", 10) || - ! strncasecmp (cp, "message/", 8)) { + ! strncasecmp (cp, "message/", 8)) adios (NULL, "-fixtype %s not allowed", cp); - } else if (! strchr (cp, '/')) { + if (! strchr (cp, '/')) adios (NULL, "-fixtype requires type/subtype"); - } if (fx.fixtypes == NULL) { fx.fixtypes = svector_create (10); } svector_push_back (fx.fixtypes, cp); continue; @@ -287,11 +287,9 @@ main (int argc, char **argv) { } } if (*cp == '+' || *cp == '@') { - if (folder) { + if (folder) adios (NULL, "only one folder at a time!"); - } else { - folder = pluspath (cp); - } + folder = pluspath (cp); } else { if (*cp == '/') { /* Interpret a full path as a filename, not a message. */ @@ -372,7 +370,7 @@ main (int argc, char **argv) { set_text_ctparams(ct, fx.decodetypes, fx.lf_line_endings); *ctp++ = ct; } else { - advise (NULL, "unable to parse message from file %s", file); + inform("unable to parse message from file %s", file); status = NOTOK; /* If there's an outfile, pass the input message unchanged, so the @@ -386,7 +384,7 @@ main (int argc, char **argv) { } if (copy_input_to_output (file, infp, outfile, outfp) != OK) { - advise (NULL, "unable to copy message to %s, " + inform("unable to copy message to %s, " "it might be lost\n", outfile); } @@ -406,7 +404,7 @@ main (int argc, char **argv) { if (! folder) { folder = getfolder (1); } - maildir = m_maildir (folder); + maildir = mh_xstrdup(m_maildir (folder)); /* chdir so that error messages, esp. from MIME parser, just refer to the message and not its path. */ @@ -442,7 +440,7 @@ main (int argc, char **argv) { set_text_ctparams(ct, fx.decodetypes, fx.lf_line_endings); *ctp++ = ct; } else { - advise (NULL, "unable to parse message %s", msgnam); + inform("unable to parse message %s", msgnam); status = NOTOK; /* If there's an outfile, pass the input message @@ -465,10 +463,8 @@ main (int argc, char **argv) { if (copy_input_to_output (input_filename, infp, outfile, outfp) != OK) { - advise (NULL, - "unable to copy message to %s, " - "it might be lost\n", - outfile); + inform("unable to copy message to %s, " + "it might be lost\n", outfile); } fclose (infp); @@ -505,6 +501,7 @@ main (int argc, char **argv) { status = 1; } + mh_xfree(maildir); free (cts); if (fx.fixtypes != NULL) { svector_free (fx.fixtypes); } @@ -607,7 +604,7 @@ mhfixmsgsbr (CT *ctp, char *maildir, const fix_transformations *fx, to the output. */ if (copy_input_to_output (input_filename, *infp, outfile, *outfp) != OK) { - advise (NULL, "unable to copy message to %s, it might be lost\n", + inform("unable to copy message to %s, it might be lost\n", outfile); } } @@ -691,16 +688,16 @@ fix_boundary (CT *ct, int *message_mods) { } } else { *ct = NULL; - advise (NULL, "unable to parse fixed part"); + inform("unable to parse fixed part"); status = NOTOK; } free (filename); } else { - advise (NULL, "unable to replace broken boundary"); + inform("unable to replace broken boundary"); status = NOTOK; } } else { - advise (NULL, "unable to create temporary file in %s", + inform("unable to create temporary file in %s", get_temp_dir()); status = NOTOK; } @@ -766,11 +763,9 @@ get_multipart_boundary (CT ct, char **part_boundary) { } } - if (! end_boundary && begin > (off_t) (ct->c_begin + sizeof buffer)) { - begin -= sizeof buffer; - } else { + if (end_boundary || begin <= (off_t) (ct->c_begin + sizeof buffer)) break; - } + begin -= sizeof buffer; } /* Get boundary at beginning of multipart. */ @@ -821,11 +816,11 @@ replace_boundary (CT ct, char *file, char *boundary) { int compnum, state; char buf[NMH_BUFSIZ], name[NAMESZ]; char *np, *vp; - m_getfld_state_t gstate = 0; + m_getfld_state_t gstate; int status = OK; if (ct->c_file == NULL) { - advise (NULL, "missing input filename"); + inform("missing input filename"); return NOTOK; } @@ -840,10 +835,11 @@ replace_boundary (CT ct, char *file, char *boundary) { return NOTOK; } + gstate = m_getfld_state_init(fpin); for (compnum = 1;;) { int bufsz = (int) sizeof buf; - switch (state = m_getfld (&gstate, name, buf, &bufsz, fpin)) { + switch (state = m_getfld2(&gstate, name, buf, &bufsz)) { case FLD: case FLDPLUS: compnum++; @@ -855,7 +851,7 @@ replace_boundary (CT ct, char *file, char *boundary) { /* if necessary, get rest of field */ while (state == FLDPLUS) { bufsz = sizeof buf; - state = m_getfld (&gstate, name, buf, &bufsz, fpin); + state = m_getfld2(&gstate, name, buf, &bufsz); vp = add (buf, vp); /* add to previous value */ } @@ -874,7 +870,7 @@ replace_boundary (CT ct, char *file, char *boundary) { strlen(new_ctline) + 1, ct->c_ctinfo.ci_first_pm, NULL, 0); fprintf (fpout, "%s:%s%s\n", np, new_ctline, - new_params ? new_params : ""); + FENDNULL(new_params)); free(new_ctline); mh_xfree(new_params); } @@ -897,12 +893,12 @@ replace_boundary (CT ct, char *file, char *boundary) { case LENERR: case FMTERR: - advise (NULL, "message format error in component #%d", compnum); + inform("message format error in component #%d", compnum); status = NOTOK; break; default: - advise (NULL, "getfld() returned %d", state); + inform("getfld() returned %d", state); status = NOTOK; break; } @@ -984,7 +980,7 @@ fix_types (CT ct, svector_t fixtypes, int *message_mods) { *cp = '\0'; ct_subtype = mh_xstrdup(++cp); } else { - advise (NULL, "missing / in MIME type of %s %s", + inform("missing / in MIME type of %s %s", ct->c_file, ct->c_partno); free (ct_type); return NOTOK; @@ -999,7 +995,7 @@ fix_types (CT ct, svector_t fixtypes, int *message_mods) { ct->c_ctinfo.ci_subtype = ct_subtype; if (! replace_substring (&ct->c_ctline, type, ct_type_subtype)) { - advise (NULL, "did not find %s in %s", + inform("did not find %s in %s", type, ct->c_ctline); } @@ -1016,10 +1012,8 @@ fix_types (CT ct, svector_t fixtypes, int *message_mods) { type, ct_type_subtype); } break; - } else { - advise (NULL, "did not find %s in %s", - type, hf->value); } + inform("did not find %s in %s", type, hf->value); } } } @@ -1069,7 +1063,7 @@ replace_substring (char **str, const char *old, const char *new) { char * remove_parameter (char *str, const char *name) { /* It looks to me, based on the BNF in RFC 2045, than there can't - be whitespace betwwen the parameter name and the "=", or + be whitespace between the parameter name and the "=", or between the "=" and the parameter value. */ char *param_name = concat (name, "=", NULL); char *cp; @@ -1336,9 +1330,8 @@ ensure_text_plain (CT *ct, CT parent, int *message_mods, int replacetextplain) { parent->c_ctinfo.ci_subtype = mh_xstrdup("alternative"); if (! replace_substring (&parent->c_ctline, "/related", "/alternative")) { - advise (NULL, - "did not find multipart/related in %s", - parent->c_ctline); + inform("did not find multipart/related in %s", + parent->c_ctline); } /* Update Content-Type header field. */ @@ -1357,11 +1350,9 @@ ensure_text_plain (CT *ct, CT parent, int *message_mods, int replacetextplain) { multipart/alternative. */ remove_parameter (hf->value, "type"); break; - } else { - advise (NULL, "did not find multipart/" - "related in header %s", - hf->value); } + inform("did not find multipart/" + "related in header %s", hf->value); } } } else { @@ -1492,7 +1483,7 @@ build_text_plain_part (CT encoded_part) { /* This m_mktemp2() call closes the temp file. */ if ((tempfile = m_mktemp2 (NULL, invo_name, NULL, NULL)) == NULL) { - advise (NULL, "unable to create temporary file in %s", + inform("unable to create temporary file in %s", get_temp_dir()); } else { tmp_plain_file = mh_xstrdup (tempfile); @@ -1630,7 +1621,7 @@ decode_part (CT ct) { (void) m_unlink (tmp_decoded); free (tmp_decoded); if (fclose (file)) { - admonish (NULL, "unable to close temporary file %s", tempfile); + inform("unable to close temporary file %s, continuing...", tempfile); } return status; @@ -1657,16 +1648,16 @@ reformat_part (CT ct, char *file, char *type, char *subtype, int c_type) { /* Check for invo_name-format-type/subtype. */ if ((cf = context_find_by_type ("format", type, subtype)) == NULL) { if (verbosw) { - advise (NULL, "Don't know how to convert %s, there is no " + inform("Don't know how to convert %s, there is no " "%s-format-%s/%s profile entry", ct->c_file, invo_name, type, subtype); } return NOTOK; } if (strchr (cf, '>')) { - advise (NULL, "'>' prohibited in \"%s\",\nplease fix your " + inform("'>' prohibited in \"%s\",\nplease fix your " "%s-format-%s/%s profile entry", cf, invo_name, type, - subtype ? subtype : ""); + FENDNULL(subtype)); return NOTOK; } @@ -1783,13 +1774,13 @@ build_multipart_alt (CT first_alt, CT new_part, int type, int subtype) { snprintf (buffer2, sizeof buffer2, "%d", serial); boundary = concat (boundary_prefix, - first_alt->c_partno ? first_alt->c_partno : "", + FENDNULL(first_alt->c_partno), "-", buffer2, NULL); } } if (found_boundary) { - advise (NULL, "giving up trying to find a unique boundary"); + inform("giving up trying to find a unique boundary"); free_content (ct); return NULL; } @@ -2026,8 +2017,7 @@ decode_text_parts (CT ct, int encoding, const char *decodetypes, report (NULL, ct->c_partno, ct->c_file, "will not decode%s because it is binary (%s)", ct->c_partno ? "" - : ct->c_ctline ? ct->c_ctline - : "", + : (FENDNULL(ct->c_ctline)), reason); } (void) m_unlink (ct->c_cefile.ce_file); @@ -2041,8 +2031,7 @@ decode_text_parts (CT ct, int encoding, const char *decodetypes, report (NULL, ct->c_partno, ct->c_file, "will not decode%s because it is 8bit", ct->c_partno ? "" - : ct->c_ctline ? ct->c_ctline - : ""); + : (FENDNULL(ct->c_ctline))); } (void) m_unlink (ct->c_cefile.ce_file); free (ct->c_cefile.ce_file); @@ -2061,7 +2050,7 @@ decode_text_parts (CT ct, int encoding, const char *decodetypes, ++*message_mods; if (verbosw) { report (NULL, ct->c_partno, ct->c_file, "decode%s", - ct->c_ctline ? ct->c_ctline : ""); + FENDNULL(ct->c_ctline)); } if (lf_line_endings) { strip_crs (ct, message_mods); @@ -2168,13 +2157,14 @@ content_encoding (CT ct, const char **reason) { *reason = ""; } break; - } else if (*cp == '\n') { + } + if (*cp == '\n') { line_len = 0; } else if (! isascii ((unsigned char) *cp)) { encoding = CE_8BIT; } - last_char_was_cr = *cp == '\r' ? 1 : 0; + last_char_was_cr = *cp == '\r'; } } @@ -2257,7 +2247,7 @@ strip_crs (CT ct, int *message_mods) { break; } - last_char_was_cr = *cp == '\r' ? 1 : 0; + last_char_was_cr = *cp == '\r'; } } @@ -2303,7 +2293,7 @@ strip_crs (CT ct, int *message_mods) { } if (close (fd)) { - admonish (NULL, "unable to write temporary file %s", + inform("unable to write temporary file %s, continuing...", stripped_content_file); (void) m_unlink (stripped_content_file); status = NOTOK; @@ -2598,7 +2588,7 @@ fix_filename_param (char *name, char *value, PM *first_pm, PM *last_pm) { replace_param (first_pm, last_pm, name, decoded, 0); fixed = 1; } else { - advise (NULL, "failed to decode %s parameter %s", name, value); + inform("failed to decode %s parameter %s", name, value); } } @@ -2663,7 +2653,7 @@ fix_filename_encoding (CT ct) { free((void *)new_params); /* Cast away const. Sigh. */ free((void *)params); } else { - advise (NULL, "did not find semicolon in %s:%s\n", + inform("did not find semicolon in %s:%s\n", hf->name, hf->value); } } @@ -2718,15 +2708,15 @@ write_content (CT ct, const char *input_filename, char *outfile, FILE *outfp, expand filename to absolute path. */ int file = ct->c_file && ct->c_file[0] == '/'; - admonish (NULL, "unable to rename %s %s to %s", + inform("unable to rename %s %s to %s, continuing...", file ? "file" : "message", outfile, infile); status = NOTOK; } } } else { - admonish (NULL, "unable to remove input file %s, " - "not modifying it", infile); + inform("unable to remove input file %s, " + "not modifying it, continuing...", infile); (void) m_unlink (outfile); status = NOTOK; } @@ -2817,7 +2807,7 @@ report (char *what, char *partno, char *filename, char *message, ...) { if (verbosw) { va_start (args, message); fmt = concat (filename, partno ? " part " : ", ", - partno ? partno : "", partno ? ", " : "", message, NULL); + FENDNULL(partno), partno ? ", " : "", message, NULL); advertise (what, NULL, fmt, args);