* in a multipart.
* 2) Suppress the warning about bogus multipart content, and report it.
* 3) Suppress the warning about extraneous trailing ';' in header parameter
- * lists, and report it.
+ * lists.
*/
int skip_mp_cte_check;
int suppress_bogus_mp_content_warning;
int bogus_mp_content;
int suppress_extraneous_trailing_semicolon_warning;
-int extraneous_trailing_semicolon;
+
+/*
+ * By default, suppress warning about multiple MIME-Version header fields.
+ */
int suppress_multiple_mime_version_warning = 1;
/* list of preferred type/subtype pairs, for -prefer */
CT ct;
size_t n;
+ bogus_mp_content = 0;
+
/*
* Check if file is actually standard input
*/
get_temp_dir());
return NULL;
}
- file = add (tfile, NULL);
+ file = mh_xstrdup(tfile);
while ((n = fread(buffer, 1, sizeof(buffer), stdin)) > 0) {
if (fwrite(buffer, 1, n, fp) != n) {
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) {
for (dp = cp; istoken (*dp); dp++)
continue;
c = *dp, *dp = '\0';
- ci->ci_type = add (cp, NULL); /* store content type */
+ ci->ci_type = mh_xstrdup(cp); /* store content type */
*dp = c, cp = dp;
if (!*ci->ci_type) {
TYPE_FIELD, ct->c_file);
return NOTOK;
}
-
- /* down case the content type string */
- for (dp = ci->ci_type; *dp; dp++)
- *dp = tolower ((unsigned char) *dp);
+ to_lower(ci->ci_type);
while (isspace ((unsigned char) *cp))
cp++;
if (*cp != '/') {
if (!magic)
- ci->ci_subtype = add ("", NULL);
+ ci->ci_subtype = mh_xstrdup("");
goto magic_skip;
}
for (dp = cp; istoken (*dp); dp++)
continue;
c = *dp, *dp = '\0';
- ci->ci_subtype = add (cp, NULL); /* store the content subtype */
+ ci->ci_subtype = mh_xstrdup(cp); /* store the content subtype */
*dp = c, cp = dp;
if (!*ci->ci_subtype) {
TYPE_FIELD, ct->c_file, ci->ci_type);
return NOTOK;
}
-
- /* down case the content subtype string */
- for (dp = ci->ci_subtype; *dp; dp++)
- *dp = tolower ((unsigned char) *dp);
+ to_lower(ci->ci_subtype);
magic_skip:
while (isspace ((unsigned char) *cp))
*/
if (*cp) {
if (magic) {
- ci->ci_magic = add (cp, NULL);
+ ci->ci_magic = mh_xstrdup(cp);
/* If there is a Content-Disposition header and it doesn't
have a *filename=, extract it from the magic contents.
for (dp = cp; istoken (*dp); dp++)
continue;
c = *dp, *dp = '\0';
- ct->c_dispo_type = add (cp, NULL); /* store disposition type */
+ ct->c_dispo_type = mh_xstrdup(cp); /* store disposition type */
*dp = c, cp = dp;
if (*cp == '(' && get_comment (ct->c_file, DISPO_FIELD, &cp, NULL) == NOTOK)
*commentp = concat (dp, " ", buffer, NULL);
free (dp);
} else {
- *commentp = add (buffer, NULL);
+ *commentp = mh_xstrdup(buffer);
}
}
ct->c_encoding != CE_8BIT && ct->c_encoding != CE_BINARY) {
/* Copy the Content-Transfer-Encoding header field body so we can
remove any trailing whitespace and leading blanks from it. */
- char *cte = add (ct->c_celine ? ct->c_celine : "(null)", NULL);
+ char *cte = mh_xstrdup(ct->c_celine ? ct->c_celine : "(null)");
bp = cte + strlen (cte) - 1;
while (bp >= cte && isspace ((unsigned char) *bp)) *bp-- = '\0';
p = part->mp_part;
sprintf (pp, "%d", partnum);
- p->c_partno = add (partnam, NULL);
+ p->c_partno = mh_xstrdup(partnam);
/* initialize the content of the subparts */
if (p->c_ctinitfnx && (*p->c_ctinitfnx) (p) == NOTOK) {
if (*file == NULL) {
ce->ce_unlink = 1;
} else {
- ce->ce_file = add (*file, NULL);
+ ce->ce_file = mh_xstrdup(*file);
ce->ce_unlink = 0;
}
adios(NULL, "unable to create temporary file in %s",
get_temp_dir());
}
- ce->ce_file = add (tempfile, NULL);
+ ce->ce_file = mh_xstrdup(tempfile);
}
if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
if (*file == NULL) {
ce->ce_unlink = 1;
} else {
- ce->ce_file = add (*file, NULL);
+ ce->ce_file = mh_xstrdup(*file);
ce->ce_unlink = 0;
}
adios(NULL, "unable to create temporary file in %s",
get_temp_dir());
}
- ce->ce_file = add (tempfile, NULL);
+ ce->ce_file = mh_xstrdup(tempfile);
}
if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
if (*file == NULL) {
ce->ce_unlink = 1;
} else {
- ce->ce_file = add (*file, NULL);
+ ce->ce_file = mh_xstrdup(*file);
ce->ce_unlink = 0;
}
adios(NULL, "unable to create temporary file in %s",
get_temp_dir());
}
- ce->ce_file = add (tempfile, NULL);
+ ce->ce_file = mh_xstrdup(tempfile);
}
if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
}
if (*file)
- ce->ce_file = add (*file, NULL);
+ ce->ce_file = mh_xstrdup(*file);
else if (caching)
- ce->ce_file = add (cachefile, NULL);
+ ce->ce_file = mh_xstrdup(cachefile);
else {
char *tempfile;
if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
adios(NULL, "unable to create temporary file in %s",
get_temp_dir());
}
- ce->ce_file = add (tempfile, NULL);
+ ce->ce_file = mh_xstrdup(tempfile);
}
if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
adios(NULL, "unable to create temporary file in %s",
get_temp_dir());
}
- ce->ce_file = add (tempfile, NULL);
+ ce->ce_file = mh_xstrdup(tempfile);
ce->ce_unlink = 1;
} else {
- ce->ce_file = add (*file, NULL);
+ ce->ce_file = mh_xstrdup(*file);
ce->ce_unlink = 0;
}
/* showproc is for mhshow and mhstore, though mhlist -debug
* prints it, too. */
mh_xfree(ct->c_showproc);
- ct->c_showproc = add ("true", NULL);
+ ct->c_showproc = mh_xstrdup("true");
fseek (ce->ce_fp, 0L, SEEK_SET);
*file = ce->ce_file;
}
if (*file)
- ce->ce_file = add(*file, NULL);
+ ce->ce_file = mh_xstrdup(*file);
else if (caching)
- ce->ce_file = add(cachefile, NULL);
+ ce->ce_file = mh_xstrdup(cachefile);
else {
char *tempfile;
if ((tempfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
adios(NULL, "unable to create temporary file in %s",
get_temp_dir());
}
- ce->ce_file = add (tempfile, NULL);
+ ce->ce_file = mh_xstrdup(tempfile);
}
if ((ce->ce_fp = fopen(ce->ce_file, "w+")) == NULL) {
"parameter list",
filename, fieldname);
}
- extraneous_trailing_semicolon = 1;
return DONE;
}
if (partial) {
for (pp = phead; pp != NULL; pp = pp->next) {
- if (strcasecmp(nameptr, pp->name) == 0)
+ if (strcasecmp(nameptr, pp->name) == 0) {
+ free (nameptr);
+ nameptr = pp->name;
break;
+ }
}
if (pp == NULL) {
"%s's %s: field\n%*s(parameter %s)", sp->index,
filename, fieldname, strlen(invo_name) + 2, "",
nameptr);
- free (nameptr);
return NOTOK;
}
if (sp2->index < sp->index &&
"param in message %s's %s: field\n%*s(parameter %s)",
filename, fieldname, strlen(invo_name) + 2, "",
nameptr);
- free (nameptr);
return NOTOK;
}
}
#endif /* HAVE_ICONV */
/*
- * Take everything non-ASCII and substituite the replacement character
+ * Take everything non-ASCII and substitute the replacement character
*/
q = buffer;
bufsize = sizeof(buffer);
for (p = pm->pm_value; *p != '\0' && bufsize > 1; p++, q++, bufsize--) {
- /* FIXME: !iscntrl should perhaps be isprint as that allows all
- * classes bar cntrl, whereas the cntrl class can include those
- * in space and blank.
- * http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap07.html */
- if (isascii((unsigned char) *p) && !iscntrl((unsigned char) *p))
+ if (isascii((unsigned char) *p) && isprint((unsigned char) *p))
*q = *p;
else
*q = replace;
projects / nmh / blobdiff