-
-/*
- * mhparse.c -- routines to parse the contents of MIME messages
+/* mhparse.c -- routines to parse the contents of MIME messages
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
#include <h/mime.h>
#include <h/mhparse.h>
#include <h/utils.h>
+#include <h/mhcachesbr.h>
+#include "../sbr/m_mktemp.h"
+#include "mhfree.h"
#ifdef HAVE_ICONV
# include <iconv.h>
#endif /* HAVE_ICONV */
extern int debugsw;
-/* cache policies */
-extern int rcachesw; /* mhcachesbr.c */
-extern int wcachesw; /* mhcachesbr.c */
-
int checksw = 0; /* check Content-MD5 field */
/*
*/
struct k2v SubText[] = {
{ "plain", TEXT_PLAIN },
- { "richtext", TEXT_RICHTEXT }, /* defined in RFC-1341 */
- { "enriched", TEXT_ENRICHED }, /* defined in RFC-1896 */
+ { "richtext", TEXT_RICHTEXT }, /* defined in RFC 1341 */
+ { "enriched", TEXT_ENRICHED }, /* defined in RFC 1896 */
{ NULL, TEXT_UNKNOWN } /* this one must be last! */
};
};
-/* mhcachesbr.c */
-int find_cache (CT, int, int *, char *, char *, int);
-
/* mhmisc.c */
int part_ok (CT);
int type_ok (CT, int);
void content_error (char *, CT, char *, ...);
-/* mhfree.c */
-void free_encoding (CT, int);
-
/*
* static prototypes
*/
FILE *fp;
CT ct;
size_t n;
+ struct stat statbuf;
bogus_mp_content = 0;
return NULL;
}
fseek (fp, 0L, SEEK_SET);
+ } else if (stat (file, &statbuf) == NOTOK) {
+ advise (file, "unable to stat");
+ return NULL;
+ } else if (S_ISDIR(statbuf.st_mode)) {
+ /* Don't try to parse a directory. */
+ inform("%s is a directory", file);
+ return NULL;
} else if ((fp = fopen (file, "r")) == NULL) {
advise (file, "unable to read");
return NULL;
if (!(ct = get_content (fp, file, 1))) {
if (is_stdin)
(void) m_unlink (file);
- advise (NULL, "unable to decode %s", file);
+ inform("unable to decode %s", file);
return NULL;
}
get_content (FILE *in, char *file, int toplevel)
{
int compnum, state;
- char buf[BUFSIZ], name[NAMESZ];
+ char buf[NMH_BUFSIZ], name[NAMESZ];
char *np, *vp;
CT ct;
HF hp;
continue;
case BODY:
+ /* There are two cases. The unusual one is when there is no
+ * blank line between the headers and the body. This is
+ * indicated by the name of the header starting with `:'.
+ *
+ * For both cases, normal first, `1' is the desired c_begin
+ * file position for the start of the body, and `2' is the
+ * file position when buf is returned.
+ *
+ * f o o : b a r \n \n b o d y \n bufsz = 6
+ * 1 2 move -5
+ * f o o : b a r \n b o d y \n bufsz = 4
+ * 1 2 move -4
+ *
+ * For the normal case, bufsz includes the
+ * header-terminating `\n', even though it is not in buf,
+ * but bufsz isn't affected when it's missing in the unusual
+ * case. */
if (name[0] == ':') {
- /* Special case: no blank line between header and body. The
- file position indicator is on the newline at the end of the
- line, but it needs to be one prior to the beginning of the
- line. So subtract the length of the line, bufsz, plus 1. */
- ct->c_begin = ftell (in) - (bufsz + 1);
+ ct->c_begin = ftell(in) - bufsz;
} else {
ct->c_begin = ftell (in) - (bufsz - 1);
}
ucmp = !strcasecmp (cp, VRSN_VALUE);
*dp = c;
if (!ucmp) {
- admonish (NULL, "message %s has unknown value for %s: field (%s)",
+ inform("message %s has unknown value for %s: field (%s), continuing...",
ct->c_file, VRSN_FIELD, cp);
}
if (!ct->c_vrsn) {
ct->c_vrsn = vrsn;
} else {
if (! suppress_multiple_mime_version_warning)
- advise (NULL, "message %s has multiple %s: fields",
+ inform("message %s has multiple %s: fields",
ct->c_file, VRSN_FIELD);
free(vrsn);
}
/* Check if we've already seen a Content-Type header */
if (ct->c_ctline) {
- advise (NULL, "message %s has multiple %s: fields",
+ inform("message %s has multiple %s: fields",
ct->c_file, TYPE_FIELD);
goto next_header;
}
* Content-Transfer-Encoding field
*/
if (ct->c_celine) {
- advise (NULL, "message %s has multiple %s: fields",
+ inform("message %s has multiple %s: fields",
ct->c_file, ENCODING_FIELD);
goto next_header;
}
goto next_header;
if (ct->c_digested) {
- advise (NULL, "message %s has multiple %s: fields",
+ inform("message %s has multiple %s: fields",
ct->c_file, MD5_FIELD);
goto next_header;
}
for (dp = cp; istoken (*dp); dp++)
continue;
- c = *dp, *dp = '\0';
+ c = *dp;
+ *dp = '\0';
ci->ci_type = mh_xstrdup(cp); /* store content type */
- *dp = c, cp = dp;
+ *dp = c;
+ cp = dp;
if (!*ci->ci_type) {
- advise (NULL, "invalid %s: field in message %s (empty type)",
+ inform("invalid %s: field in message %s (empty type)",
TYPE_FIELD, ct->c_file);
return NOTOK;
}
for (dp = cp; istoken (*dp); dp++)
continue;
- c = *dp, *dp = '\0';
+ c = *dp;
+ *dp = '\0';
ci->ci_subtype = mh_xstrdup(cp); /* store the content subtype */
- *dp = c, cp = dp;
+ *dp = c;
+ cp = dp;
if (!*ci->ci_subtype) {
- advise (NULL,
- "invalid %s: field in message %s (empty subtype for \"%s\")",
- TYPE_FIELD, ct->c_file, ci->ci_type);
+ inform("invalid %s: field in message %s (empty subtype for \"%s\")",
+ TYPE_FIELD, ct->c_file, ci->ci_type);
return NOTOK;
}
to_lower(ci->ci_subtype);
mh_xfree(ct->c_id);
ct->c_id = NULL;
if (!(dp = strchr(ct->c_id = ++cp, '>'))) {
- advise (NULL, "invalid ID in message %s", ct->c_file);
+ inform("invalid ID in message %s", ct->c_file);
return NOTOK;
}
c = *dp;
if (*dp == ']')
break;
if (dp < cp) {
- advise (NULL, "invalid description in message %s", ct->c_file);
+ inform("invalid description in message %s", ct->c_file);
ct->c_descr = NULL;
return NOTOK;
}
if (*dp == '}')
break;
if (dp < cp) {
- advise (NULL, "invalid disposition in message %s", ct->c_file);
+ inform("invalid disposition in message %s", ct->c_file);
ct->c_dispo = NULL;
return NOTOK;
}
cp++;
if (dp == cp) {
- advise (NULL, "invalid null transfer encoding specification");
+ inform("invalid null transfer encoding specification");
return NOTOK;
}
}
if (ct->c_reqencoding == CE_UNKNOWN) {
- advise (NULL, "invalid CTE specification: \"%s\"", dp);
+ inform("invalid CTE specification: \"%s\"", dp);
return NOTOK;
}
}
}
else
- advise (NULL,
- "extraneous information in message %s's %s: field\n%*s(%s)",
- ct->c_file, TYPE_FIELD, strlen(invo_name) + 2, "", cp);
+ inform("extraneous information in message %s's %s: field\n%*s(%s)",
+ ct->c_file, TYPE_FIELD, strlen(invo_name) + 2, "", cp);
}
return OK;
for (dp = cp; istoken (*dp); dp++)
continue;
- c = *dp, *dp = '\0';
+ c = *dp;
+ *dp = '\0';
ct->c_dispo_type = mh_xstrdup(cp); /* store disposition type */
- *dp = c, cp = dp;
+ *dp = c;
+ cp = dp;
if (*cp == '(' && get_comment (ct->c_file, DISPO_FIELD, &cp, NULL) == NOTOK)
return NOTOK;
return NOTOK;
}
} else if (*cp) {
- advise (NULL,
- "extraneous information in message %s's %s: field\n%*s(%s)",
- ct->c_file, DISPO_FIELD, strlen(invo_name) + 2, "", cp);
+ inform("extraneous information in message %s's %s: field\n%*s(%s)",
+ ct->c_file, DISPO_FIELD, strlen(invo_name) + 2, "", cp);
}
if (buildflag)
switch (c = *cp++) {
case '\0':
invalid:
- advise (NULL, "invalid comment in message %s's %s: field",
+ inform("invalid comment in message %s's %s: field",
filename, fieldname);
return NOTOK;
/*
* The encoding for multipart messages must be either
- * 7bit, 8bit, or binary (per RFC2045).
+ * 7bit, 8bit, or binary (per RFC 2045).
*/
if (! skip_mp_cte_check && ct->c_encoding != CE_7BIT &&
ct->c_encoding != CE_8BIT && ct->c_encoding != CE_BINARY) {
while (bp >= cte && isspace ((unsigned char) *bp)) *bp-- = '\0';
for (bp = cte; *bp && isblank ((unsigned char) *bp); ++bp) continue;
- admonish (NULL,
- "\"%s/%s\" type in message %s must be encoded in\n"
- "7bit, 8bit, or binary, per RFC 2045 (6.4). "
- "mhfixmsg -fixcte can fix it, or\n"
- "manually edit the file and change the \"%s\"\n"
- "Content-Transfer-Encoding to one of those. For now",
- ci->ci_type, ci->ci_subtype, ct->c_file, bp);
+ inform("\"%s/%s\" type in message %s must be encoded in\n"
+ "7bit, 8bit, or binary, per RFC 2045 (6.4). "
+ "mhfixmsg -fixcte can fix it, or\n"
+ "manually edit the file and change the \"%s\"\n"
+ "Content-Transfer-Encoding to one of those. For now, continuing...",
+ ci->ci_type, ci->ci_subtype, ct->c_file, bp);
free (cte);
return NOTOK;
/* complain if boundary parameter is missing */
if (!pm) {
- advise (NULL,
- "a \"boundary\" parameter is mandatory for \"%s/%s\" type in message %s's %s: field",
- ci->ci_type, ci->ci_subtype, ct->c_file, TYPE_FIELD);
+ inform("a \"boundary\" parameter is mandatory for \"%s/%s\" type in message %s's %s: field",
+ ci->ci_type, ci->ci_subtype, ct->c_file, TYPE_FIELD);
return NOTOK;
}
for (cp = bp; isspace ((unsigned char) *cp); cp++)
continue;
if (!*cp) {
- advise (NULL, "invalid \"boundary\" parameter for \"%s/%s\" type in message %s's %s: field",
+ inform("invalid \"boundary\" parameter for \"%s/%s\" type in message %s's %s: field",
ci->ci_type, ci->ci_subtype, ct->c_file, TYPE_FIELD);
return NOTOK;
}
}
if (! suppress_bogus_mp_content_warning) {
- advise (NULL, "bogus multipart content in message %s", ct->c_file);
+ inform("bogus multipart content in message %s", ct->c_file);
}
bogus_mp_content = 1;
* ease of choosing/displaying it later on. from a mail message on
* nmh-workers, from kenh:
* "Stock" MH 6.8.5 did not have a reverse_parts() function, but I
- * see code in mhn that did the same thing... Acccording to the RCS
+ * see code in mhn that did the same thing... According to the RCS
* logs, that code was around from the initial checkin of mhn.c by
* John Romine in 1992, which is as far back as we have."
*/
CI ci = &ct->c_ctinfo;
if ((ct->c_encoding != CE_7BIT) && (ct->c_encoding != CE_8BIT)) {
- admonish (NULL,
- "\"%s/%s\" type in message %s should be encoded in 7bit or 8bit",
- ci->ci_type, ci->ci_subtype, ct->c_file);
+ inform("\"%s/%s\" type in message %s should be encoded in "
+ "7bit or 8bit, continuing...", ci->ci_type, ci->ci_subtype,
+ ct->c_file);
return NOTOK;
}
if (sscanf (pm->pm_value, "%d", &p->pm_partno) != 1
|| p->pm_partno < 1) {
invalid_param:
- advise (NULL,
- "invalid %s parameter for \"%s/%s\" type in message %s's %s field",
- pm->pm_name, ci->ci_type, ci->ci_subtype,
- ct->c_file, TYPE_FIELD);
+ inform("invalid %s parameter for \"%s/%s\" type in message %s's %s field",
+ pm->pm_name, ci->ci_type, ci->ci_subtype,
+ ct->c_file, TYPE_FIELD);
return NOTOK;
}
continue;
if (!p->pm_partid
|| !p->pm_partno
|| (p->pm_maxno && p->pm_partno > p->pm_maxno)) {
- advise (NULL,
- "invalid parameters for \"%s/%s\" type in message %s's %s field",
- ci->ci_type, ci->ci_subtype,
- ct->c_file, TYPE_FIELD);
+ inform("invalid parameters for \"%s/%s\" type in message %s's %s field",
+ ci->ci_type, ci->ci_subtype, ct->c_file, TYPE_FIELD);
return NOTOK;
}
}
}
if (!e->eb_access) {
- advise (NULL,
- "invalid parameters for \"%s/%s\" type in message %s's %s field",
- ci->ci_type, ci->ci_subtype, ct->c_file, TYPE_FIELD);
+ inform("invalid parameters for \"%s/%s\" type in message %s's %s field",
+ ci->ci_type, ci->ci_subtype, ct->c_file, TYPE_FIELD);
return NOTOK;
}
if (ct->c_digested) {
if (memcmp(digest, ct->c_digest,
- sizeof(digest) / sizeof(digest[0]))) {
+ sizeof digest)) {
content_error (NULL, ct,
"content integrity suspect (digest mismatch) -- continuing");
} else {
for (ep = (cp = bufp) + cc - 1; cp <= ep; ep--)
if (!isspace ((unsigned char) *ep))
break;
- *++ep = '\n', ep++;
+ *++ep = '\n';
+ ep++;
for (; cp < ep; cp++) {
if (quoted > 0) {
* sequence; let's decode it (above). */
quoted = 1;
continue;
- } else {
- /* One or both of the next 2 is out of range, making this
- * an invalid escape sequence; just show the raw bytes
- * (below). */
}
+ /* One or both of the next 2 is out of range, making this
+ * an invalid escape sequence; just show the raw bytes
+ * (below). */
}
/* Just show the raw byte. */
MD5Final (digest, &mdContext);
if (memcmp((char *) digest, (char *) ct->c_digest,
- sizeof(digest) / sizeof(digest[0])))
+ sizeof digest))
content_error (NULL, ct,
"content integrity suspect (digest mismatch) -- continuing");
else
default:
if (pidXwait (child_id, NULL) == OK)
- advise (NULL, "request sent");
+ inform("request sent");
break;
}
size_t len;
if (decodeBase64 (cp, &digest, &len, 0, NULL) == OK) {
- const size_t maxlen = sizeof ct->c_digest / sizeof ct->c_digest[0];
+ const size_t maxlen = sizeof ct->c_digest;
if (strlen ((char *) digest) <= maxlen) {
memcpy (ct->c_digest, digest, maxlen);
if (*cp == 0) {
if (! suppress_extraneous_trailing_semicolon_warning) {
- advise (NULL,
- "extraneous trailing ';' in message %s's %s: "
- "parameter list",
- filename, fieldname);
+ inform("extraneous trailing ';' in message %s's %s: "
+ "parameter list", filename, fieldname);
}
return DONE;
}
for (up = dp; isspace ((unsigned char) *dp);)
dp++;
if (dp == cp || *dp != '=') {
- advise (NULL,
- "invalid parameter in message %s's %s: "
- "field\n%*sparameter %s (error detected at offset %d)",
- filename, fieldname, strlen(invo_name) + 2, "",cp, dp - cp);
+ inform("invalid parameter in message %s's %s: "
+ "field\n%*sparameter %s (error detected at offset %d)",
+ filename, fieldname, strlen(invo_name) + 2, "",cp, dp - cp);
return NOTOK;
}
if (*vp == '*' && vp < up - 1) {
partial = 1;
continue;
- } else if (*vp == '*' && vp == up - 1) {
+ }
+ if (*vp == '*' && vp == up - 1) {
encoded = 1;
} else if (partial) {
if (isdigit((unsigned char) *vp))
index = *vp - '0' + index * 10;
else {
- advise (NULL, "invalid parameter index in message %s's "
+ inform("invalid parameter index in message %s's "
"%s: field\n%*s(parameter %s)", filename,
fieldname, strlen(invo_name) + 2, "", cp);
return NOTOK;
}
vp++;
} else {
- advise(NULL, "missing charset in message %s's %s: "
+ inform("missing charset in message %s's %s: "
"field\n%*s(parameter %s)", filename, fieldname,
strlen(invo_name) + 2, "", nameptr);
free(nameptr);
}
vp++;
} else {
- advise(NULL, "missing language tag in message %s's %s: "
+ inform("missing language tag in message %s's %s: "
"field\n%*s(parameter %s)", filename, fieldname,
strlen(invo_name) + 2, "", nameptr);
free(nameptr);
!isxdigit((unsigned char) *(vp + 1)) ||
*(vp + 2) == '\0' ||
!isxdigit((unsigned char) *(vp + 2))) {
- advise(NULL, "invalid encoded sequence in message "
+ inform("invalid encoded sequence in message "
"%s's %s: field\n%*s(parameter %s)",
filename, fieldname, strlen(invo_name) + 2,
"", nameptr);
switch (*cp++) {
case '\0':
bad_quote:
- advise (NULL,
- "invalid quoted-string in message %s's %s: "
- "field\n%*s(parameter %s)",
- filename, fieldname, strlen(invo_name) + 2, "",
- nameptr);
+ inform("invalid quoted-string in message %s's %s: "
+ "field\n%*s(parameter %s)", filename,
+ fieldname, strlen(invo_name) + 2, "", nameptr);
free(nameptr);
mh_xfree(charset);
mh_xfree(lang);
} else {
for (sp2 = pp->sechead; sp2 != NULL; sp2 = sp2->next) {
if (sp2->index == sp->index) {
- advise (NULL, "duplicate index (%d) in message "
+ inform("duplicate index (%d) in message "
"%s's %s: field\n%*s(parameter %s)", sp->index,
filename, fieldname, strlen(invo_name) + 2, "",
nameptr);
}
if (sp2 == NULL) {
- advise(NULL, "Internal error: cannot insert partial "
+ inform("Internal error: cannot insert partial "
"param in message %s's %s: field\n%*s(parameter %s)",
filename, fieldname, strlen(invo_name) + 2, "",
nameptr);
int pindex = 0;
for (sp = pp->sechead; sp != NULL; sp = sp->next) {
if (sp->index != pindex++) {
- advise(NULL, "missing section %d for parameter in "
+ inform("missing section %d for parameter in "
"message %s's %s: field\n%*s(parameter %s)", pindex - 1,
filename, fieldname, strlen(invo_name) + 2, "",
pp->name);
continue;
if (strlen(params->pm_name) > CPERLIN) {
- advise(NULL, "Parameter name \"%s\" is too long", params->pm_name);
+ inform("Parameter name \"%s\" is too long", params->pm_name);
mh_xfree(paramout);
return NULL;
}
}
/*
- * At this point, we're either finishing a contined parameter, or
+ * At this point, we're either finishing a continued parameter, or
* we're working on a new one.
*/
output += n;
outlen += n;
if (output > endptr) {
- advise(NULL, "Internal error: parameter buffer overflow");
+ inform("Internal error: parameter buffer overflow");
return 0;
}
}
outlen++;
}
if (output > endptr) {
- advise(NULL, "Internal error: parameter buffer overflow");
+ inform("Internal error: parameter buffer overflow");
return 0;
}
}
outlen++;
}
if (output > endptr) {
- advise(NULL, "Internal error: parameter buffer overflow");
+ inform("Internal error: parameter buffer overflow");
return 0;
}
}
if (output - 2 > endptr) {
- advise(NULL, "Internal error: parameter buffer overflow");
+ inform("Internal error: parameter buffer overflow");
return 0;
}
projects / nmh / blobdiff