extern int bogus_mp_content; /* flag from InitMultiPart */
/* flags to/from parse_header_attrs */
extern int suppress_extraneous_trailing_semicolon_warning;
-extern int extraneous_trailing_semicolon;
/* mhoutsbr.c */
int output_message (CT, char *);
/* mhfree.c */
extern CT *cts;
-void freects_done (int) NORETURN;
/*
* static prototypes
char *textcharset;
} fix_transformations;
-int mhfixmsgsbr (CT *, const fix_transformations *, char *);
+int mhfixmsgsbr (CT *, char *, const fix_transformations *, char *);
static int fix_boundary (CT *, int *);
static int copy_input_to_output (const char *, const char *);
static int get_multipart_boundary (CT, char **);
main (int argc, char **argv) {
int msgnum;
char *cp, *file = NULL, *folder = NULL;
- char *maildir, buf[100], *outfile = NULL;
+ char *maildir = NULL, buf[100], *outfile = NULL;
char **argp, **arguments;
struct msgs_array msgs = { 0, 0, NULL };
struct msgs *mp = NULL;
if (nmh_init(argv[0], 2)) { return 1; }
- done = freects_done;
-
arguments = getarguments (invo_name, argc, argv, 1);
argp = arguments;
if (! (cp = *argp++) || (*cp == '-' && cp[1])) {
adios (NULL, "missing argument to %s", argp[-2]);
}
- file = *cp == '-' ? add (cp, NULL) : path (cp, TFILE);
+ file = *cp == '-' ? mh_xstrdup (cp) : 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);
+ outfile = *cp == '-' ? mh_xstrdup (cp) : path (cp, TFILE);
continue;
case RPROCSW:
if (!(rmmproc = *argp++) || *rmmproc == '-') {
} else {
if (*cp == '/') {
/* Interpret a full path as a filename, not a message. */
- file = add (cp, NULL);
+ file = mh_xstrdup (cp);
} else {
app_msgarg (&msgs, cp);
}
get_temp_dir());
} else {
free (file);
- file = add (cp, NULL);
+ file = mh_xstrdup (cp);
cpydata (STDIN_FILENO, fd, "-", file);
}
}
maildir = m_maildir (folder);
+ /* chdir so that error messages, esp. from MIME parser, just
+ refer to the message and not its path. */
if (chdir (maildir) == NOTOK) {
adios (maildir, "unable to change directory to");
}
for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
if (is_selected(mp, msgnum)) {
- char *msgnam;
+ char *msgnam = m_name (msgnum);
- msgnam = m_name (msgnum);
if ((ct = parse_mime (msgnam))) {
set_text_ctparams(ct, fx.decodetypes, fx.lf_line_endings);
*ctp++ = ct;
advise (NULL, "unable to parse message %s", msgnam);
status = NOTOK;
- /* If there's an outfile, pass the input message unchanged, so the message won't
- get dropped from a pipeline. */
+ /* If there's an outfile, pass the input message
+ unchanged, so the message won't get dropped from a
+ pipeline. */
if (outfile) {
- /* Something went wrong. Output might be expected, such as if this were run
- as a filter. Just copy the input to the output. */
- const char *input_filename = path (msgnam, TFILE);
+ /* Something went wrong. Output might be expected,
+ such as if this were run as a filter. Just copy
+ the input to the output. */
+ /* Can't use path() here because 1) it might have been
+ called before and it caches the pwd, and 2) we call
+ chdir() after that. */
+ char *input_filename =
+ concat (maildir, "/", msgnam, NULL);
if (copy_input_to_output (input_filename, outfile) != OK) {
- advise (NULL, "unable to copy message to %s, it might be lost\n", outfile);
+ advise (NULL,
+ "unable to copy message to %s, it might be lost\n",
+ outfile);
}
+ free (input_filename);
}
}
}
if (*cts) {
for (ctp = cts; *ctp; ++ctp) {
- status += mhfixmsgsbr (ctp, &fx, outfile);
+ status += mhfixmsgsbr (ctp, maildir, &fx, outfile);
+ free_content (*ctp);
if (using_stdin) {
(void) m_unlink (file);
status = 1;
}
+ free (cts);
+
if (fx.fixtypes != NULL) { svector_free (fx.fixtypes); }
free (outfile);
free (file);
free (folder);
free (arguments);
- /* done is freects_done, which will clean up all of cts. */
done (status);
return NOTOK;
}
* Apply transformations to one message.
*/
int
-mhfixmsgsbr (CT *ctp, const fix_transformations *fx, char *outfile) {
+mhfixmsgsbr (CT *ctp, char *maildir, const fix_transformations *fx,
+ char *outfile) {
/* Store input filename in case one of the transformations, i.e.,
fix_boundary(), rewrites to a tmp file. */
- char *input_filename = add ((*ctp)->c_file, NULL);
+ char *input_filename = maildir
+ ? concat (maildir, "/", (*ctp)->c_file, NULL)
+ : mh_xstrdup ((*ctp)->c_file);
int modify_inplace = 0;
int message_mods = 0;
int status = OK;
adios (NULL, "unable to create temporary file in %s",
get_temp_dir());
}
- outfile = add (tempfile, NULL);
+ outfile = mh_xstrdup (tempfile);
} else {
adios (NULL, "missing both input and output filenames\n");
}
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);
+ char *filename = mh_xstrdup ((*ct)->c_file);
CT fixed_ct;
free_content (*ct);
*/
static int
get_multipart_boundary (CT ct, char **part_boundary) {
- char buffer[BUFSIZ];
+ char buffer[NMH_BUFSIZ];
char *end_boundary = NULL;
off_t begin = (off_t) ct->c_end > (off_t) (ct->c_begin + sizeof buffer)
? (off_t) (ct->c_end - sizeof buffer)
size_t bytes_read;
int status = OK;
- /* This will fail if the boundary spans fread() calls. BUFSIZ should
+ /* This will fail if the boundary spans fread() calls. NMH_BUFSIZ should
be big enough, even if it's just 1024, to make that unlikely. */
- /* free_content() will close ct->c_fp. */
+ /* free_content() will close ct->c_fp if bogus MP boundary is fixed. */
if (! ct->c_fp && (ct->c_fp = fopen (ct->c_file, "r")) == NULL) {
advise (ct->c_file, "unable to open for reading");
return NOTOK;
if ((end = rfind_str (buffer, cp - buffer, "\n"))) {
if (strlen (end) > 3 && *end++ == '\n' &&
*end++ == '-' && *end++ == '-') {
- end_boundary = add (end, NULL);
+ end_boundary = mh_xstrdup (end);
break;
}
}
status = NOTOK;
}
+ if (ct->c_fp) {
+ fclose (ct->c_fp);
+ ct->c_fp = NULL;
+ }
+
if (status == OK) {
*part_boundary = end_boundary;
} else {
replace_boundary (CT ct, char *file, char *boundary) {
FILE *fpin, *fpout;
int compnum, state;
- char buf[BUFSIZ], name[NAMESZ];
+ char buf[NMH_BUFSIZ], name[NAMESZ];
char *np, *vp;
m_getfld_state_t gstate = 0;
int status = OK;
compnum++;
/* 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) {
fprintf (fpout, "%s:%s%s\n", np, new_ctline,
new_params ? new_params : "");
free(new_ctline);
- if (new_params) {
- free(new_params);
- }
+ mh_xfree(new_params);
}
free (vp);
continue;
case BODY:
- fputs ("\n", fpout);
+ putc('\n', fpout);
/* buf will have a terminating NULL, skip it. */
if ((int) fwrite (buf, 1, bufsz-1, fpout) < bufsz-1) {
advise (file, "fwrite");
* c_ctline
*/
/* Extract type and subtype from type/subtype. */
- ct_type = getcpy (ct_type_subtype);
+ ct_type = mh_xstrdup(ct_type_subtype);
if ((cp = strchr (ct_type, '/'))) {
*cp = '\0';
- ct_subtype = getcpy (++cp);
+ ct_subtype = mh_xstrdup(++cp);
} else {
advise (NULL, "missing / in MIME type of %s %s",
ct->c_file, ct->c_partno);
char *prefix, *new_str;
if (cp - *str) {
- prefix = getcpy (*str);
+ prefix = mh_xstrdup(*str);
*(prefix + (cp - *str)) = '\0';
new_str = concat (prefix, new, remainder, NULL);
free (prefix);
free (*str);
return *str = new_str;
- } else {
- return NULL;
}
+
+ return NULL;
}
HF h;
NEW(h);
- h->name = add (hf->name, NULL);
+ h->name = mh_xstrdup (hf->name);
h->hf_encoding = hf->hf_encoding;
h->next = hf->next;
hf->next = h;
free (encoding);
}
- h->value = add (" 8bit\n", NULL);
+ h->value = mh_xstrdup (" 8bit\n");
/* Don't need to warn for multiple C-T-E header
fields, parse_mime() already does that. But
}
}
if (! found_cte) {
- add_header (ct, add (ENCODING_FIELD, NULL), cte);
+ add_header (ct, mh_xstrdup (ENCODING_FIELD), cte);
}
/* Update c_celine. It's used only by mhlist -debug. */
free (ct->c_celine);
- ct->c_celine = add (cte, NULL);
+ ct->c_celine = mh_xstrdup (cte);
return OK;
- } else {
- return NOTOK;
}
+
+ return NOTOK;
}
HF hf;
parent->c_subtype = MULTI_ALTERNATE;
+ free (parent->c_ctinfo.ci_subtype);
parent->c_ctinfo.ci_subtype = mh_xstrdup("alternative");
if (! replace_substring (&parent->c_ctline, "/related",
"/alternative")) {
buffer, NULL);
return 1;
- } else {
- free_content (new_part->mp_part);
- free (new_part);
-
- return 0;
}
+
+ free_content (new_part->mp_part);
+ free (new_part);
+
+ return 0;
}
advise (NULL, "unable to create temporary file in %s",
get_temp_dir());
} else {
- tmp_plain_file = add (tempfile, NULL);
+ tmp_plain_file = mh_xstrdup (tempfile);
if (reformat_part (tp_part, tmp_plain_file,
tp_part->c_ctinfo.ci_type,
tp_part->c_ctinfo.ci_subtype,
NEW0(new_part);
/* Just copy over what is needed for decoding. c_vrsn and
c_celine aren't necessary. */
- new_part->c_file = add (ct->c_file, NULL);
+ new_part->c_file = mh_xstrdup (ct->c_file);
new_part->c_begin = ct->c_begin;
new_part->c_end = ct->c_end;
copy_ctinfo (&new_part->c_ctinfo, &ct->c_ctinfo);
/* c_ctline is used by reformat__part(), so it can preserve
anything after the type/subtype. */
- new_part->c_ctline = add (ct->c_ctline, NULL);
+ new_part->c_ctline = mh_xstrdup (ct->c_ctline);
return new_part;
}
copy_ctinfo (CI dest, CI src) {
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;
+ dest->ci_type = src->ci_type ? mh_xstrdup (src->ci_type) : NULL;
+ dest->ci_subtype = src->ci_subtype ? mh_xstrdup (src->ci_subtype) : NULL;
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);
+ d_pm->pm_charset = mh_xstrdup(s_pm->pm_charset);
}
if (s_pm->pm_lang) {
- d_pm->pm_lang = getcpy(s_pm->pm_lang);
+ d_pm->pm_lang = mh_xstrdup(s_pm->pm_lang);
}
}
- dest->ci_comment = src->ci_comment ? add (src->ci_comment, NULL) : NULL;
- dest->ci_magic = src->ci_magic ? add (src->ci_magic, NULL) : NULL;
+ dest->ci_comment = src->ci_comment ? mh_xstrdup (src->ci_comment) : NULL;
+ dest->ci_magic = src->ci_magic ? mh_xstrdup (src->ci_magic) : 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);
+ tmp_decoded = mh_xstrdup (tempfile);
/* 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. */
ct->c_file, invo_name, type, subtype);
}
return NOTOK;
- } else {
- if (strchr (cf, '>')) {
- advise (NULL, "'>' prohibited in \"%s\",\nplease fix your "
- "%s-format-%s/%s profile entry", cf, invo_name, type,
- subtype ? subtype : "");
+ }
+ if (strchr (cf, '>')) {
+ advise (NULL, "'>' prohibited in \"%s\",\nplease fix your "
+ "%s-format-%s/%s profile entry", cf, invo_name, type,
+ subtype ? subtype : "");
- return NOTOK;
- }
+ return NOTOK;
}
cp = concat (cf, " >", file, NULL);
}
output_encoding = content_encoding (ct, &reason);
- if (set_ct_type (ct, c_type, output_subtype, output_encoding) == OK) {
+ if (status == OK &&
+ set_ct_type (ct, c_type, output_subtype, output_encoding) == OK) {
ct->c_cefile.ce_file = file;
ct->c_cefile.ce_unlink = 1;
} else {
c_showproc, c_termproc, c_storeproc, c_storage, c_folder
*/
- ct->c_file = add (first_alt->c_file, NULL);
+ ct->c_file = mh_xstrdup (first_alt->c_file);
ct->c_type = type;
ct->c_subtype = subtype;
if ((found_boundary =
boundary_in_content (&new_part->c_cefile.ce_fp,
new_part->c_cefile.ce_file,
- boundary)) == -1) {
- free (ct);
+ boundary)) == NOTOK) {
+ free_content (ct);
return NULL;
}
}
/* Ensure that the boundary doesn't appear in the encoded
content. */
if (! found_boundary && new_part->c_file) {
- if ((found_boundary = boundary_in_content (&new_part->c_fp,
- new_part->c_file,
- boundary)) == -1) {
- free (ct);
+ if ((found_boundary =
+ boundary_in_content (&new_part->c_fp,
+ new_part->c_file,
+ boundary)) == NOTOK) {
+ free_content (ct);
return NULL;
}
}
if (found_boundary) {
advise (NULL, "giving up trying to find a unique boundary");
- free (ct);
+ free_content (ct);
return NULL;
}
}
/* Load c_first_hf and c_last_hf. */
transfer_noncontent_headers (first_alt, ct);
- add_header (ct, add (TYPE_FIELD, NULL), concat (name, "\n", NULL));
+ add_header (ct, mh_xstrdup (TYPE_FIELD), concat (name, "\n", NULL));
free (name);
/* Load c_partno. */
if (first_alt->c_partno) {
- ct->c_partno = add (first_alt->c_partno, NULL);
+ ct->c_partno = mh_xstrdup (first_alt->c_partno);
free (first_alt->c_partno);
first_alt->c_partno = concat (ct->c_partno, ".1", NULL);
new_part->c_partno = concat (ct->c_partno, ".2", NULL);
} else {
- first_alt->c_partno = add ("1", NULL);
- new_part->c_partno = add ("2", NULL);
+ first_alt->c_partno = mh_xstrdup ("1");
+ new_part->c_partno = mh_xstrdup ("2");
}
if (ctinit) {
- ct->c_ctinfo.ci_type = add (typename, NULL);
- ct->c_ctinfo.ci_subtype = add (subtypename, NULL);
+ ct->c_ctinfo.ci_type = mh_xstrdup (typename);
+ ct->c_ctinfo.ci_subtype = mh_xstrdup (subtypename);
}
add_param(&ct->c_ctinfo.ci_first_pm, &ct->c_ctinfo.ci_last_pm,
*/
static int
boundary_in_content (FILE **fp, char *file, const char *boundary) {
- char buffer[BUFSIZ];
+ char buffer[NMH_BUFSIZ];
size_t bytes_read;
int found_boundary = 0;
free (hf->value);
hf->value = (cp = strchr (ct->c_ctline, ';'))
? concat (type_subtypename, cp, "\n", NULL)
- : add (name_plus_nl, NULL);
+ : mh_xstrdup (name_plus_nl);
}
}
if (! found_content_type) {
- add_header (ct, add (TYPE_FIELD, NULL),
+ add_header (ct, mh_xstrdup (TYPE_FIELD),
(cp = strchr (ct->c_ctline, ';'))
? concat (type_subtypename, cp, "\n", NULL)
- : add (name_plus_nl, NULL));
+ : mh_xstrdup (name_plus_nl));
}
/* Some of these might not be used, but set them anyway. */
ct->c_ctline = ctline;
/* Leave other ctinfo members as they were. */
free (ct->c_ctinfo.ci_type);
- ct->c_ctinfo.ci_type = add (typename, NULL);
+ ct->c_ctinfo.ci_type = mh_xstrdup (typename);
free (ct->c_ctinfo.ci_subtype);
- ct->c_ctinfo.ci_subtype = add (subtypename, NULL);
+ ct->c_ctinfo.ci_subtype = mh_xstrdup (subtypename);
ct->c_type = type;
ct->c_subtype = subtype;
if (ce->ce_file) {
size_t line_len = 0;
- char buffer[BUFSIZ];
+ char buffer[NMH_BUFSIZ];
size_t inbytes;
if (! ce->ce_fp && (ce->ce_fp = fopen (ce->ce_file, "r")) == NULL) {
}
if (fp && *fp) {
- char buffer[BUFSIZ];
+ char buffer[NMH_BUFSIZ];
size_t bytes_read;
size_t bytes_to_read =
end > 0 && end > begin ? end - begin : sizeof buffer;
adios (NULL, "unable to create temporary file in %s",
get_temp_dir());
}
- stripped_content_file = add (tempfile, NULL);
+ stripped_content_file = mh_xstrdup (tempfile);
/* Strip each CR before a LF from the content. */
fseeko (*fp, begin, SEEK_SET);
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);
- }
+ if (ct->c_cefile.ce_file && ct->c_cefile.ce_unlink)
+ (void) m_unlink (ct->c_cefile.ce_file);
+
+ mh_xfree(ct->c_cefile.ce_file);
ct->c_cefile.ce_file = stripped_content_file;
ct->c_cefile.ce_unlink = 1;
}
}
if (! found_cte) {
- add_header (ct, add (ENCODING_FIELD, NULL), cte);
+ add_header (ct, mh_xstrdup (ENCODING_FIELD), cte);
}
}
}
*/
static int
fix_filename_param (char *name, char *value, PM *first_pm, PM *last_pm) {
- size_t value_len;
int fixed = 0;
- if (((value_len = strlen (value)) > 0) &&
- strncmp (value, "=?", 2) == 0 &&
- strncmp (&value[value_len - 2], "?=", 2) == 0) {
+ if (HasPrefix(value, "=?") && HasSuffix(value, "?=")) {
/* Looks like an RFC 2047 encoded parameter. */
char decoded[PATH_MAX + 1];
const char *const new_params = concat (params, "\n", NULL);
replace_substring (&hf->value, semicolon_loc, new_params);
- free ((char *) new_params);
- free ((char *) params);
+ free((void *)new_params); /* Cast away const. Sigh. */
+ free((void *)params);
} else {
advise (NULL, "did not find semicolon in %s:%s\n",
hf->name, hf->value);
if (message_mods > 0) {
if ((status = output_message (ct, outfile)) == OK) {
char *infile = input_filename
- ? add (input_filename, NULL)
- : add (ct->c_file ? ct->c_file : "-", NULL);
+ ? mh_xstrdup (input_filename)
+ : mh_xstrdup (ct->c_file ? ct->c_file : "-");
if (remove_file (infile) == OK) {
if (rename (outfile, infile)) {
int i = -1;
if (old != -1 && new != -1) {
- char buffer[BUFSIZ];
+ char buffer[NMH_BUFSIZ];
while ((i = read (old, buffer, sizeof buffer)) >
0) {
free (rmm_command);
return WIFEXITED (status) ? WEXITSTATUS (status) : NOTOK;
- } else {
- /* This is OK for a non-message file, it still uses the
- BACKUP_PREFIX form. The backup file will be in the same
- directory as file. */
- return rename (file, m_backup (file));
}
+ /* This is OK for a non-message file, it still uses the
+ BACKUP_PREFIX form. The backup file will be in the same
+ directory as file. */
+ return rename (file, m_backup (file));
}
projects / nmh / blobdiff