X("notextcodeset", 0, NTEXTCODESETSW) \
X("reformat", 0, REFORMATSW) \
X("noreformat", 0, NREFORMATSW) \
+ X("replacetextplain", 0, REPLACETEXTPLAINSW) \
+ X("noreplacetextplain", 0, NREPLACETEXTPLAINSW) \
X("fixboundary", 0, FIXBOUNDARYSW) \
X("nofixboundary", 0, NFIXBOUNDARYSW) \
X("fixcte", 0, FIXCTESW) \
#define quitser pipeser
/* mhparse.c */
-extern char *tmp; /* directory to place tmp files */
extern int skip_mp_cte_check; /* flag to InitMultiPart */
extern int suppress_bogus_mp_content_warning; /* flag to InitMultiPart */
extern int bogus_mp_content; /* flag from InitMultiPart */
int fixboundary;
int fixcte;
int reformat;
+ int replacetextplain;
int decodetext;
char *textcodeset;
} fix_transformations;
static char *update_attr (char *, const char *, const char *e);
static int fix_multipart_cte (CT, int *);
static int set_ce (CT, int);
-static int ensure_text_plain (CT *, CT, int *);
+static int ensure_text_plain (CT *, CT, int *, int);
static CT build_text_plain_part (CT);
static CT divide_part (CT);
static void copy_ctinfo (CI, CI);
static int set_ct_type (CT, int type, int subtype, int encoding);
static int decode_text_parts (CT, int, int *);
static int content_encoding (CT);
+static int strip_crs (CT, int *);
static int convert_codesets (CT, char *, int *);
static int convert_codeset (CT, char *, int *);
+static char *content_codeset (CT);
static int write_content (CT, char *, char *, int, int);
static int remove_file (char *);
static void report (char *, char *, char *, ...);
int status = OK;
fix_transformations fx;
fx.reformat = fx.fixcte = fx.fixboundary = 1;
+ fx.replacetextplain = 0;
fx.decodetext = CE_8BIT;
fx.textcodeset = NULL;
- done = freects_done;
-
-#ifdef LOCALE
- setlocale(LC_ALL, "");
-#endif
- invo_name = r1bindex (argv[0], '/');
+ if (nmh_init(argv[0], 1)) { return 1; }
- /* read user profile/context */
- context_read();
+ done = freects_done;
arguments = getarguments (invo_name, argc, argv, 1);
argp = arguments;
case NREFORMATSW:
fx.reformat = 0;
continue;
-
+ case REPLACETEXTPLAINSW:
+ fx.replacetextplain = 1;
+ continue;
+ case NREPLACETEXTPLAINSW:
+ fx.replacetextplain = 0;
+ continue;
case FILESW:
if (! (cp = *argp++) || (*cp == '-' && cp[1]))
adios (NULL, "missing argument to %s", argp[-2]);
file = *cp == '-' ? add (cp, NULL) : path (cp, TFILE);
continue;
-
case OUTFILESW:
if (! (cp = *argp++) || (*cp == '-' && cp[1]))
adios (NULL, "missing argument to %s", argp[-2]);
outfile = *cp == '-' ? add (cp, NULL) : path (cp, TFILE);
continue;
-
case RPROCSW:
if (!(rmmproc = *argp++) || *rmmproc == '-')
adios (NULL, "missing argument to %s", argp[-2]);
case NRPRCSW:
rmmproc = NULL;
continue;
-
case VERBSW:
verbosw = 1;
continue;
adios (NULL, "only one folder at a time!");
else
folder = pluspath (cp);
- } else
- app_msgarg(&msgs, cp);
+ } else {
+ if (*cp == '/') {
+ /* Interpret a full path as a filename, not a message. */
+ file = add (cp, NULL);
+ } else {
+ app_msgarg (&msgs, cp);
+ }
+ }
}
SIGNAL (SIGQUIT, quitser);
fclose (fp);
}
- /*
- * Check for storage directory. If specified,
- * then store temporary files there. Else we
- * store them in standard nmh directory.
- */
- if ((cp = context_find (nmhstorage)) && *cp)
- tmp = concat (cp, "/", invo_name, NULL);
- else
- tmp = add (m_maildir (invo_name), NULL);
-
suppress_bogus_mp_content_warning = skip_mp_cte_check = 1;
if (! context_find ("path"))
using_stdin = 1;
- if ((cp = m_mktemp2 (tmp, invo_name, &fd, NULL)) == NULL) {
- adios (NULL, "unable to create temporary file");
+ if ((cp = m_mktemp2 (NULL, invo_name, &fd, NULL)) == NULL) {
+ adios (NULL, "unable to create temporary file in %s",
+ get_temp_dir());
} else {
free (file);
file = add (cp, NULL);
- chmod (file, 0600);
cpydata (STDIN_FILENO, fd, "-", file);
}
if (close (fd)) {
- unlink (file);
+ (void) m_unlink (file);
adios (NULL, "failed to write temporary file");
}
}
status += mhfixmsgsbr (ctp, &fx, outfile);
if (using_stdin) {
- unlink (file);
+ (void) m_unlink (file);
if (! outfile) {
/* Just calling m_backup() unlinks the backup file. */
}
free (outfile);
- free (tmp);
free (file);
/* done is freects_done, which will clean up all of cts. */
modify_inplace = 1;
if ((*ctp)->c_file) {
- outfile = add (m_mktemp2 (tmp, invo_name, NULL, NULL), NULL);
+ char *tempfile;
+ if ((tempfile = m_mktemp2 (NULL, invo_name, NULL, NULL)) == NULL) {
+ adios (NULL, "unable to create temporary file in %s",
+ get_temp_dir());
+ }
+ outfile = add (tempfile, NULL);
} else {
adios (NULL, "missing both input and output filenames\n");
}
status = fix_multipart_cte (*ctp, &message_mods);
}
if (status == OK && fx->reformat) {
- status = ensure_text_plain (ctp, NULL, &message_mods);
+ status =
+ ensure_text_plain (ctp, NULL, &message_mods, fx->replacetextplain);
}
if (status == OK && fx->decodetext) {
status = decode_text_parts (*ctp, fx->decodetext, &message_mods);
}
if (modify_inplace) {
- if (status != OK) unlink (outfile);
+ if (status != OK) (void) m_unlink (outfile);
free (outfile);
outfile = NULL;
}
if (get_multipart_boundary (*ct, &part_boundary) == OK) {
char *fixed;
- if ((fixed = m_mktemp2 (tmp, invo_name, NULL, &(*ct)->c_fp))) {
+ if ((fixed = m_mktemp2 (NULL, invo_name, NULL, &(*ct)->c_fp))) {
if (replace_boundary (*ct, fixed, part_boundary) == OK) {
char *filename = add ((*ct)->c_file, NULL);
status = NOTOK;
}
} else {
- advise (NULL, "unable to create temporary file");
+ advise (NULL, "unable to create temporary file in %s",
+ get_temp_dir());
status = NOTOK;
}
/* Make sure each text part has a corresponding text/plain part. */
static int
-ensure_text_plain (CT *ct, CT parent, int *message_mods) {
+ensure_text_plain (CT *ct, CT parent, int *message_mods, int replacetextplain) {
int status = OK;
switch ((*ct)->c_type) {
if (parent && parent->c_type == CT_MULTIPART &&
parent->c_subtype == MULTI_ALTERNATE) {
struct multipart *mp = (struct multipart *) parent->c_ctparams;
- struct part *part;
+ struct part *part, *prev;
int new_subpart_number = 1;
/* See if there is a sibling text/plain. */
- for (part = mp->mp_parts; part; part = part->mp_next) {
+ for (prev = part = mp->mp_parts; part; part = part->mp_next) {
++new_subpart_number;
if (part->mp_part->c_type == CT_TEXT &&
part->mp_part->c_subtype == TEXT_PLAIN) {
- has_text_plain = 1;
+ if (replacetextplain) {
+ struct part *old_part;
+ if (part == mp->mp_parts) {
+ old_part = mp->mp_parts;
+ mp->mp_parts = part->mp_next;
+ } else {
+ old_part = prev->mp_next;
+ prev->mp_next = part->mp_next;
+ }
+ if (verbosw) {
+ report (parent->c_partno, parent->c_file,
+ "remove text/plain part %s",
+ old_part->mp_part->c_partno);
+ }
+ free_content (old_part->mp_part);
+ free (old_part);
+ } else {
+ has_text_plain = 1;
+ }
break;
}
+ prev = part;
}
if (! has_text_plain) {
for (part = mp->mp_parts; status == OK && part; part = part->mp_next) {
if ((*ct)->c_type == CT_MULTIPART) {
- status = ensure_text_plain (&part->mp_part, *ct, message_mods);
+ status = ensure_text_plain (&part->mp_part, *ct, message_mods,
+ replacetextplain);
}
}
break;
struct exbody *e;
e = (struct exbody *) (*ct)->c_ctparams;
- status = ensure_text_plain (&e->eb_content, *ct, message_mods);
+ status = ensure_text_plain (&e->eb_content, *ct, message_mods,
+ replacetextplain);
}
break;
}
contains the decoded contents. And the decoding function, such
as openQuoted, will have set ...->ce_unlink to 1 so that it will
be unlinked by free_content (). */
- tmp_plain_file = add (m_mktemp2 (tmp, invo_name, NULL, NULL), NULL);
+ char *tempfile;
+
+ if ((tempfile = m_mktemp2 (NULL, invo_name, NULL, NULL)) == NULL) {
+ advise (NULL, "unable to create temporary file in %s",
+ get_temp_dir());
+ }
+ tmp_plain_file = add (tempfile, NULL);
if (reformat_part (tp_part, tmp_plain_file,
tp_part->c_ctinfo.ci_type,
tp_part->c_ctinfo.ci_subtype,
}
free_content (tp_part);
- unlink (tmp_plain_file);
+ (void) m_unlink (tmp_plain_file);
free (tmp_plain_file);
return NULL;
decode_part (CT ct) {
char *tmp_decoded;
int status;
+ char *tempfile;
- tmp_decoded = add (m_mktemp2 (tmp, invo_name, NULL, NULL), NULL);
+ if ((tempfile = m_mktemp2 (NULL, invo_name, NULL, NULL)) == NULL) {
+ adios (NULL, "unable to create temporary file in %s", get_temp_dir());
+ }
+ tmp_decoded = add (tempfile, NULL);
/* The following call will load ct->c_cefile.ce_file with the tmp
filename of the decoded content. tmp_decoded will contain the
encoded output, get rid of that. */
status = output_message (ct, tmp_decoded);
- unlink (tmp_decoded);
+ (void) m_unlink (tmp_decoded);
free (tmp_decoded);
return status;
/* Unlink decoded content tmp file and free its filename to avoid
leaks. The file stream should already have been closed. */
if (ct->c_cefile.ce_unlink) {
- unlink (ct->c_cefile.ce_file);
+ (void) m_unlink (ct->c_cefile.ce_file);
free (ct->c_cefile.ce_file);
ct->c_cefile.ce_file = NULL;
ct->c_cefile.ce_unlink = 0;
}
-/* Identifies 7bit or 8bit content based on charset, if specified. */
+/* Identifies 7bit or 8bit content based on charset. */
static int
charset_encoding (CT ct) {
- int encoding = CE_8BIT;
- CI ctinfo = &ct->c_ctinfo;
- char **ap, **vp;
-
- for (ap = ctinfo->ci_attrs, vp = ctinfo->ci_values; *ap; ++ap, ++vp) {
- if (! strcasecmp (*ap, "charset")) {
- /* norm_charmap() is case sensitive. */
- char *ch = upcase (*vp);
-
- if (! strcmp (norm_charmap (ch), "US-ASCII")) encoding = CE_7BIT;
- free (ch);
- break;
- }
- }
+ /* norm_charmap() is case sensitive. */
+ char *codeset = upcase (content_codeset (ct));
+ int encoding =
+ strcmp (norm_charmap (codeset), "US-ASCII") ? CE_8BIT : CE_7BIT;
+ free (codeset);
return encoding;
}
: ct->c_ctline ? ct->c_ctline
: "");
}
- unlink (ct->c_cefile.ce_file);
+ (void) m_unlink (ct->c_cefile.ce_file);
free (ct->c_cefile.ce_file);
ct->c_cefile.ce_file = NULL;
} else if (ct->c_encoding == CE_QUOTED &&
: ct->c_ctline ? ct->c_ctline
: "");
}
- unlink (ct->c_cefile.ce_file);
+ (void) m_unlink (ct->c_cefile.ce_file);
free (ct->c_cefile.ce_file);
ct->c_cefile.ce_file = NULL;
} else {
report (ct->c_partno, ct->c_file, "decode%s",
ct->c_ctline ? ct->c_ctline : "");
}
+ strip_crs (ct, message_mods);
} else {
status = NOTOK;
}
}
break;
}
+ case CE_8BIT:
+ case CE_7BIT:
+ strip_crs (ct, message_mods);
+ break;
default:
break;
}
+
break;
case CT_MULTIPART: {
int encoding = CE_7BIT;
if (ce->ce_file) {
+ size_t line_len = 0;
char buffer[BUFSIZ];
size_t inbytes;
(inbytes = fread (buffer, 1, sizeof buffer, ce->ce_fp)) > 0) {
char *cp;
size_t i;
- size_t line_len = 0;
int last_char_was_cr = 0;
for (i = 0, cp = buffer; i < inbytes; ++i, ++cp) {
}
+static int
+strip_crs (CT ct, int *message_mods) {
+ /* norm_charmap() is case sensitive. */
+ char *codeset = upcase (content_codeset (ct));
+ int status = OK;
+
+ /* Only strip carriage returns if content is ASCII or another
+ codeset that has the same readily recognizable CR followed by a
+ 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 (codeset), "US-ASCII") ||
+ ! strncmp (norm_charmap (codeset), "ISO-8859-", 9) ||
+ ! strncmp (norm_charmap (codeset), "UTF-8", 5) ||
+ ! strncmp (norm_charmap (codeset), "WINDOWS-12", 10)) {
+ char **file = NULL;
+ FILE **fp = NULL;
+ size_t begin;
+ size_t end;
+ int has_crs = 0;
+ int opened_input_file = 0;
+
+ if (ct->c_cefile.ce_file) {
+ file = &ct->c_cefile.ce_file;
+ fp = &ct->c_cefile.ce_fp;
+ begin = end = 0;
+ } else if (ct->c_file) {
+ file = &ct->c_file;
+ fp = &ct->c_fp;
+ begin = (size_t) ct->c_begin;
+ end = (size_t) ct->c_end;
+ } /* else don't know where the content is */
+
+ if (file && *file && fp) {
+ if (! *fp) {
+ if ((*fp = fopen (*file, "r")) == NULL) {
+ advise (*file, "unable to open for reading");
+ status = NOTOK;
+ } else {
+ opened_input_file = 1;
+ }
+ }
+ }
+
+ if (fp && *fp) {
+ char buffer[BUFSIZ];
+ size_t bytes_read;
+ size_t bytes_to_read =
+ end > 0 && end > begin ? end - begin : sizeof buffer;
+
+ fseeko (*fp, begin, SEEK_SET);
+ while ((bytes_read = fread (buffer, 1,
+ min (bytes_to_read, sizeof buffer),
+ *fp)) > 0) {
+ /* Look for CR followed by a LF. This is supposed to
+ be text so there should be LF's. If not, don't
+ modify the content. */
+ char *cp;
+ size_t i;
+ int last_char_was_cr = 0;
+
+ if (end > 0) bytes_to_read -= bytes_read;
+
+ for (i = 0, cp = buffer; i < bytes_read; ++i, ++cp) {
+ if (*cp == '\n' && last_char_was_cr) {
+ has_crs = 1;
+ break;
+ }
+
+ last_char_was_cr = *cp == '\r' ? 1 : 0;
+ }
+ }
+
+ if (has_crs) {
+ int fd;
+ char *stripped_content_file;
+ char *tempfile = m_mktemp2 (NULL, invo_name, &fd, NULL);
+
+ if (tempfile == NULL) {
+ adios (NULL, "unable to create temporary file in %s",
+ get_temp_dir());
+ }
+ stripped_content_file = add (tempfile, NULL);
+
+ /* Strip each CR before a LF from the content. */
+ fseeko (*fp, begin, SEEK_SET);
+ while ((bytes_read = fread (buffer, 1, sizeof buffer, *fp)) >
+ 0) {
+ char *cp;
+ size_t i;
+ int last_char_was_cr = 0;
+
+ for (i = 0, cp = buffer; i < bytes_read; ++i, ++cp) {
+ if (*cp == '\r') {
+ last_char_was_cr = 1;
+ } else if (last_char_was_cr) {
+ if (*cp != '\n') write (fd, "\r", 1);
+ write (fd, cp, 1);
+ last_char_was_cr = 0;
+ } else {
+ write (fd, cp, 1);
+ last_char_was_cr = 0;
+ }
+ }
+ }
+
+ if (close (fd)) {
+ admonish (NULL, "unable to write temporary file %s",
+ stripped_content_file);
+ (void) m_unlink (stripped_content_file);
+ status = NOTOK;
+ } else {
+ /* Replace the decoded file with the converted one. */
+ if (ct->c_cefile.ce_file) {
+ if (ct->c_cefile.ce_unlink) {
+ (void) m_unlink (ct->c_cefile.ce_file);
+ }
+ free (ct->c_cefile.ce_file);
+ }
+ ct->c_cefile.ce_file = stripped_content_file;
+ ct->c_cefile.ce_unlink = 1;
+
+ ++*message_mods;
+ if (verbosw) {
+ report (ct->c_partno,
+ begin == 0 && end == 0 ? "" : *file,
+ "stripped CRs");
+ }
+ }
+ }
+
+ if (opened_input_file) {
+ fclose (*fp);
+ *fp = NULL;
+ }
+ }
+ }
+
+ free (codeset);
+ return status;
+}
+
+
+char *
+content_codeset (CT ct) {
+ const char *const charset = "charset";
+ char *default_codeset = NULL;
+ CI ctinfo = &ct->c_ctinfo;
+ char **ap, **vp;
+ char **src_codeset = NULL;
+
+ for (ap = ctinfo->ci_attrs, vp = ctinfo->ci_values; *ap; ++ap, ++vp) {
+ if (! strcasecmp (*ap, charset)) {
+ src_codeset = vp;
+ break;
+ }
+ }
+
+ /* RFC 2045, Sec. 5.2: default to us-ascii. */
+ if (src_codeset == NULL) src_codeset = &default_codeset;
+ if (*src_codeset == NULL) *src_codeset = "US-ASCII";
+
+ return *src_codeset;
+}
+
+
static int
convert_codesets (CT ct, char *dest_codeset, int *message_mods) {
int status = OK;
static int
convert_codeset (CT ct, char *dest_codeset, int *message_mods) {
- const char *const charset = "charset";
- char **src_codeset = NULL;
- char *default_codeset = NULL;
- CI ctinfo = &ct->c_ctinfo;
- char **ap, **vp;
+ char *src_codeset = content_codeset (ct);
int status = OK;
- for (ap = ctinfo->ci_attrs, vp = ctinfo->ci_values; *ap; ++ap, ++vp) {
- if (! strcasecmp (*ap, charset)) {
- src_codeset = vp;
- break;
- }
- }
- /* RFC 2045, Sec. 5.2: default to us-ascii. */
- if (src_codeset == NULL) src_codeset = &default_codeset;
- if (*src_codeset == NULL) *src_codeset = "US-ASCII";
+ /* norm_charmap() is case sensitive. */
+ char *src_codeset_u = upcase (src_codeset);
+ char *dest_codeset_u = upcase (dest_codeset);
+ int different_codesets =
+ strcmp (norm_charmap (src_codeset), norm_charmap (dest_codeset));
- if (strcmp (norm_charmap (*src_codeset), norm_charmap (dest_codeset))) {
+ free (dest_codeset_u);
+ free (src_codeset_u);
+
+ if (different_codesets) {
#ifdef HAVE_ICONV
iconv_t conv_desc = NULL;
char *dest;
int fd = -1;
char **file = NULL;
FILE **fp = NULL;
- long begin;
- long end;
+ size_t begin;
+ size_t end;
int opened_input_file = 0;
char src_buffer[BUFSIZ];
HF hf;
+ char *tempfile;
- if ((conv_desc = iconv_open (dest_codeset, *src_codeset)) ==
+ if ((conv_desc = iconv_open (dest_codeset, src_codeset)) ==
(iconv_t) -1) {
- advise (NULL, "Can't convert %s to %s", *src_codeset, dest_codeset);
+ advise (NULL, "Can't convert %s to %s", src_codeset, dest_codeset);
return -1;
}
- dest = add (m_mktemp2 (tmp, invo_name, &fd, NULL), NULL);
+ if ((tempfile = m_mktemp2 (NULL, invo_name, &fd, NULL)) == NULL) {
+ adios (NULL, "unable to create temporary file in %s",
+ get_temp_dir());
+ }
+ dest = add (tempfile, NULL);
if (ct->c_cefile.ce_file) {
file = &ct->c_cefile.ce_file;
fp = &ct->c_cefile.ce_fp;
- begin = 0;
- end = -1;
+ begin = end = 0;
} else if (ct->c_file) {
file = &ct->c_file;
fp = &ct->c_fp;
- begin = ct->c_begin;
- end = ct->c_end;
+ begin = (size_t) ct->c_begin;
+ end = (size_t) ct->c_end;
} /* else no input file: shouldn't happen */
if (file && *file && fp) {
if (fp && *fp) {
size_t inbytes;
- size_t max = end > 0 ? (size_t) (end-begin) : sizeof src_buffer;
+ size_t bytes_to_read =
+ end > 0 && end > begin ? end - begin : sizeof src_buffer;
fseeko (*fp, begin, SEEK_SET);
- while (status == OK && max > 0 &&
- (inbytes = fread (src_buffer, 1, max, *fp)) > 0) {
+ while ((inbytes = fread (src_buffer, 1,
+ min (bytes_to_read, sizeof src_buffer),
+ *fp)) > 0) {
char dest_buffer[BUFSIZ];
- char *ib = src_buffer, *ob = dest_buffer;
+ ICONV_CONST char *ib = src_buffer;
+ char *ob = dest_buffer;
size_t outbytes = sizeof dest_buffer;
size_t outbytes_before = outbytes;
- if (end > 0) max -= inbytes;
+ if (end > 0) bytes_to_read -= inbytes;
if (iconv (conv_desc, &ib, &inbytes, &ob, &outbytes) ==
(size_t) -1) {
/* Replace the decoded file with the converted one. */
if (ct->c_cefile.ce_file) {
if (ct->c_cefile.ce_unlink) {
- unlink (ct->c_cefile.ce_file);
+ (void) m_unlink (ct->c_cefile.ce_file);
}
free (ct->c_cefile.ce_file);
}
++*message_mods;
if (verbosw) {
report (ct->c_partno, ct->c_file, "convert %s to %s",
- *src_codeset, dest_codeset);
+ src_codeset, dest_codeset);
}
/* Update ci_attrs. */
- *src_codeset = dest_codeset;
+ src_codeset = dest_codeset;
/* Update ct->c_ctline. */
if (ct->c_ctline) {
}
}
} else {
- unlink (dest);
+ (void) m_unlink (dest);
}
#else /* ! HAVE_ICONV */
NMH_UNUSED (message_mods);
- advise (NULL, "Can't convert %s to %s without iconv", *src_codeset,
+ advise (NULL, "Can't convert %s to %s without iconv", src_codeset,
dest_codeset);
status = NOTOK;
#endif /* ! HAVE_ICONV */
}
if (new != -1) close (new);
if (old != -1) close (old);
- unlink (outfile);
+ (void) m_unlink (outfile);
if (i < 0) {
/* The -file argument processing used path() to
} else {
admonish (NULL, "unable to remove input file %s, "
"not modifying it", infile);
- unlink (outfile);
+ (void) m_unlink (outfile);
status = NOTOK;
}
}
} else {
/* No modifications and didn't need the tmp outfile. */
- unlink (outfile);
+ (void) m_unlink (outfile);
}
} else {
/* Output is going to some file. Produce it whether or not
projects / nmh / blobdiff