int output_message (CT, char *);
/* mhshowsbr.c */
-int show_content_aux (CT, int, int, char *, char *);
+int show_content_aux (CT, int, char *, char *);
/* mhmisc.c */
void flush_errors (void);
static void reverse_alternative_parts (CT);
static int fix_boundary (CT *, int *);
static int get_multipart_boundary (CT, char **);
-static int replace_boundary (CT, char *, const char *);
+static int replace_boundary (CT, char *, char *);
static int fix_multipart_cte (CT, int *);
static int set_ce (CT, int);
static int ensure_text_plain (CT *, CT, int *, int);
static int convert_charsets (CT, char *, int *);
static int write_content (CT, char *, char *, int, int);
static int remove_file (char *);
-static void report (char *, char *, char *, ...);
+static void report (char *, char *, char *, char *, ...);
static void pipeser (int);
++*message_mods;
if (verbosw) {
- report (NULL, filename,
+ report (NULL, NULL, filename,
"fix multipart boundary");
}
}
while (begin >= (off_t) ct->c_begin) {
fseeko (ct->c_fp, begin, SEEK_SET);
while ((bytes_read = fread (buffer, 1, sizeof buffer, ct->c_fp)) > 0) {
- char *end = buffer + bytes_read - 1;
- char *cp;
+ char *cp = rfind_str (buffer, bytes_read, "--");
+
+ if (cp) {
+ char *end;
- if ((cp = rfind_str (buffer, bytes_read, "--"))) {
/* Trim off trailing "--" and anything beyond. */
*cp-- = '\0';
if ((end = rfind_str (buffer, cp - buffer, "\n"))) {
/* Open and copy ct->c_file to file, replacing the multipart boundary. */
static int
-replace_boundary (CT ct, char *file, const char *boundary) {
+replace_boundary (CT ct, char *file, char *boundary) {
FILE *fpin, *fpout;
int compnum, state;
char buf[BUFSIZ], name[NAMESZ];
if (strcasecmp (TYPE_FIELD, np)) {
fprintf (fpout, "%s:%s", np, vp);
} else {
- char *new_boundary = update_attr (vp, "boundary=", boundary);
-
- fprintf (fpout, "%s:%s\n", np, new_boundary);
- free (new_boundary);
+ char *new_ctline, *new_params;
+
+ replace_param(&ct->c_ctinfo.ci_first_pm,
+ &ct->c_ctinfo.ci_last_pm, "boundary",
+ boundary, 0);
+
+ new_ctline = concat(" ", ct->c_ctinfo.ci_type, "/",
+ ct->c_ctinfo.ci_subtype, NULL);
+ new_params = output_params(strlen(TYPE_FIELD) +
+ 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 : "");
+ free(new_ctline);
+ if (new_params)
+ free(new_params);
}
free (vp);
++*message_mods;
if (verbosw) {
char *encoding = cpytrim (hf->value);
- report (ct->c_partno, ct->c_file,
+ report (NULL, ct->c_partno, ct->c_file,
"replace Content-Transfer-Encoding of %s "
"with 8 bit", encoding);
free (encoding);
prev->mp_next = part->mp_next;
}
if (verbosw) {
- report (parent->c_partno, parent->c_file,
+ report (NULL, parent->c_partno, parent->c_file,
"remove text/plain part %s",
old_part->mp_part->c_partno);
}
++*message_mods;
if (verbosw) {
- report (parent->c_partno, parent->c_file,
+ report (NULL, parent->c_partno, parent->c_file,
"insert text/plain part");
}
} else {
++*message_mods;
if (verbosw) {
- report ((*ct)->c_partno, (*ct)->c_file,
+ report (NULL, (*ct)->c_partno, (*ct)->c_file,
"insert text/plain part");
}
} else {
static void
copy_ctinfo (CI dest, CI src) {
- char **s_ap, **d_ap, **s_vp, **d_vp;
+ PM s_pm, d_pm;
dest->ci_type = src->ci_type ? add (src->ci_type, NULL) : NULL;
dest->ci_subtype = src->ci_subtype ? add (src->ci_subtype, NULL) : NULL;
- for (s_ap = src->ci_attrs, d_ap = dest->ci_attrs,
- s_vp = src->ci_values, d_vp = dest->ci_values;
- *s_ap;
- ++s_ap, ++d_ap, ++s_vp, ++d_vp) {
- *d_ap = add (*s_ap, NULL);
- *d_vp = *s_vp;
+ for (s_pm = src->ci_first_pm; s_pm; s_pm = s_pm->pm_next) {
+ d_pm = add_param(&dest->ci_first_pm, &dest->ci_last_pm, s_pm->pm_name,
+ s_pm->pm_value, 0);
+ if (s_pm->pm_charset)
+ d_pm->pm_charset = getcpy(s_pm->pm_charset);
+ if (s_pm->pm_lang)
+ d_pm->pm_lang = getcpy(s_pm->pm_lang);
}
- *d_ap = NULL;
dest->ci_comment = src->ci_comment ? add (src->ci_comment, NULL) : NULL;
dest->ci_magic = src->ci_magic ? add (src->ci_magic, NULL) : NULL;
free (cp);
cp = concat (cf, " >", file, NULL);
- status = show_content_aux (ct, 1, 0, cp, NULL);
+ status = show_content_aux (ct, 0, cp, NULL);
free (cp);
/* Unlink decoded content tmp file and free its filename to avoid
/* Identifies 7bit or 8bit content based on charset. */
static int
charset_encoding (CT ct) {
- /* norm_charmap() is case sensitive. */
- char *charset = upcase (content_charset (ct));
int encoding =
- strcmp (norm_charmap (charset), "US-ASCII") ? CE_8BIT : CE_7BIT;
+ strcasecmp (content_charset (ct), "US-ASCII") ? CE_8BIT : CE_7BIT;
- free (charset);
return encoding;
}
CT ct;
struct part *p;
struct multipart *m;
- char *cp;
const struct str2init *ctinit;
if ((ct = (CT) calloc (1, sizeof *ct)) == NULL)
c_cefile, c_encoding,
c_digested, c_digest[16], c_ctexbody,
c_ctinitfnx, c_ceopenfnx, c_ceclosefnx, c_cesizefnx,
- c_umask, c_pid, c_rfc934,
+ c_umask, c_rfc934,
c_showproc, c_termproc, c_storeproc, c_storage, c_folder
*/
boundary_in_content (&new_part->c_cefile.ce_fp,
new_part->c_cefile.ce_file,
boundary)) == -1) {
+ free (ct);
return NULL;
}
}
if ((found_boundary = boundary_in_content (&new_part->c_fp,
new_part->c_file,
boundary)) == -1) {
+ free (ct);
return NULL;
}
}
if (found_boundary) {
advise (NULL, "giving up trying to find a unique boundary");
+ free (ct);
return NULL;
}
}
ct->c_ctinfo.ci_subtype = add (subtypename, NULL);
}
- name = concat (" ", typename, "/", subtypename, boundary_indicator,
- boundary, NULL);
- if ((cp = strstr (name, boundary_indicator))) {
- ct->c_ctinfo.ci_attrs[0] = name;
- ct->c_ctinfo.ci_attrs[1] = NULL;
- /* ci_values don't get free'd, so point into ci_attrs. */
- ct->c_ctinfo.ci_values[0] = cp + strlen (boundary_indicator);
- }
+ add_param(&ct->c_ctinfo.ci_first_pm, &ct->c_ctinfo.ci_last_pm,
+ "boundary", boundary, 0);
p = (struct part *) mh_xmalloc (sizeof *p);
p->mp_next = (struct part *) mh_xmalloc (sizeof *p->mp_next);
/* The decoding isn't acceptable so discard it.
Leave status as OK to allow other transformations. */
if (verbosw) {
- report (ct->c_partno, ct->c_file,
+ 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
/* The decoding isn't acceptable so discard it.
Leave status as OK to allow other transformations. */
if (verbosw) {
- report (ct->c_partno, ct->c_file,
+ 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
if (set_ce (ct, enc) == OK) {
++*message_mods;
if (verbosw) {
- report (ct->c_partno, ct->c_file, "decode%s",
+ report (NULL, ct->c_partno, ct->c_file, "decode%s",
ct->c_ctline ? ct->c_ctline : "");
}
strip_crs (ct, message_mods);
static int
strip_crs (CT ct, int *message_mods) {
- /* norm_charmap() is case sensitive. */
- char *charset = upcase (content_charset (ct));
+ char *charset = content_charset (ct);
int status = OK;
/* Only strip carriage returns if content is ASCII or another
LF. We can include UTF-8 here because if the high-order bit of
a UTF-8 byte is 0, then it must be a single-byte ASCII
character. */
- if (! strcmp (norm_charmap (charset), "US-ASCII") ||
- ! strncmp (norm_charmap (charset), "ISO-8859-", 9) ||
- ! strncmp (norm_charmap (charset), "UTF-8", 5) ||
- ! strncmp (norm_charmap (charset), "WINDOWS-12", 10)) {
+ if (! strcasecmp (charset, "US-ASCII") ||
+ ! strcasecmp (charset, "UTF-8") ||
+ ! strncasecmp (charset, "ISO-8859-", 9) ||
+ ! strncasecmp (charset, "WINDOWS-12", 10)) {
char **file = NULL;
FILE **fp = NULL;
size_t begin;
++*message_mods;
if (verbosw) {
- report (ct->c_partno,
+ report (NULL, ct->c_partno,
begin == 0 && end == 0 ? "" : *file,
"stripped CRs");
}
}
}
- free (charset);
return status;
}
case CT_TEXT:
if (ct->c_subtype == TEXT_PLAIN) {
status = convert_charset (ct, dest_charset, message_mods);
- if (verbosw && status == OK) {
- report (ct->c_partno, ct->c_file, "convert %s to %s",
- content_charset(ct), dest_charset);
+ if (status == OK) {
+ if (verbosw) {
+ report (NULL, ct->c_partno, ct->c_file,
+ "convert %s to %s",
+ content_charset(ct), dest_charset);
+ }
+ } else {
+ report ("iconv", ct->c_partno, ct->c_file,
+ "failed to convert %s to %s",
+ content_charset(ct), dest_charset);
}
}
break;
static void
-report (char *partno, char *filename, char *message, ...) {
+report (char *what, char *partno, char *filename, char *message, ...) {
va_list args;
char *fmt;
fmt = concat (filename, partno ? " part " : ", ",
partno ? partno : "", partno ? ", " : "", message, NULL);
- advertise (NULL, NULL, fmt, args);
+ advertise (what, NULL, fmt, args);
free (fmt);
va_end (args);
projects / nmh / blobdiff