-
-/*
- * 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
*/
return NULL;
}
fseek (fp, 0L, SEEK_SET);
- } else if (lstat (file, &statbuf) == NOTOK) {
- advise (file, "unable to lstat");
+ } 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. */
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);
}
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) {
inform("invalid %s: field in message %s (empty type)",
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) {
inform("invalid %s: field in message %s (empty subtype for \"%s\")",
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;
/*
* 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) {
* 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."
*/
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
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 (*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))
}
/*
- * 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.
*/
projects / nmh / blobdiff