#include <h/mime.h>
#include <h/mhparse.h>
#include <h/utils.h>
+#include "mhmisc.h"
+#include <h/mhcachesbr.h>
+#include "sbr/m_mktemp.h"
+#include "mhfree.h"
#ifdef HAVE_ICONV
# include <iconv.h>
#endif /* HAVE_ICONV */
+#include "sbr/base64.h"
extern int debugsw;
-/* cache policies */
-extern int rcachesw; /* mhcachesbr.c */
-extern int wcachesw; /* mhcachesbr.c */
-
int checksw = 0; /* check Content-MD5 field */
/*
* 3) Suppress the warning about extraneous trailing ';' in header parameter
* lists.
*/
-int skip_mp_cte_check;
-int suppress_bogus_mp_content_warning;
-int bogus_mp_content;
-int suppress_extraneous_trailing_semicolon_warning;
+bool skip_mp_cte_check;
+bool suppress_bogus_mp_content_warning;
+bool bogus_mp_content;
+bool suppress_extraneous_trailing_semicolon_warning;
/*
* By default, suppress warning about multiple MIME-Version header fields.
*/
-int suppress_multiple_mime_version_warning = 1;
+bool suppress_multiple_mime_version_warning = true;
/* list of preferred type/subtype pairs, for -prefer */
-char *preferred_types[NPREFS],
- *preferred_subtypes[NPREFS];
+mime_type_subtype mime_preference[NPREFS];
int npreferred;
};
-/* 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
*/
/*
* NOTE WELL: si_key MUST NOT have value of NOTOK
*
- * si_key is 1 if access method is anonymous.
+ * si_val is 1 if access method is anonymous.
*/
struct str2init str2methods[] = {
{ "afs", 1, InitFile },
size_t n;
struct stat statbuf;
- bogus_mp_content = 0;
+ bogus_mp_content = false;
/*
* Check if file is actually standard input
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;
- m_getfld_state_t gstate = 0;
+ m_getfld_state_t gstate;
/* allocate the content structure */
NEW0(ct);
ct->c_fp = in;
- ct->c_file = add (file, NULL);
+ ct->c_file = mh_xstrdup(FENDNULL(file));
ct->c_begin = ftell (ct->c_fp) + 1;
/*
* Parse the header fields for this
* content into a linked list.
*/
- m_getfld_track_filepos (&gstate, in);
+ gstate = m_getfld_state_init(in);
+ m_getfld_track_filepos2(&gstate);
for (compnum = 1;;) {
int bufsz = sizeof buf;
- switch (state = m_getfld (&gstate, name, buf, &bufsz, in)) {
+ switch (state = m_getfld2(&gstate, name, buf, &bufsz)) {
case FLD:
case FLDPLUS:
compnum++;
/* if necessary, get rest of field */
while (state == FLDPLUS) {
bufsz = sizeof buf;
- state = m_getfld (&gstate, name, buf, &bufsz, in);
+ state = m_getfld2(&gstate, name, buf, &bufsz);
vp = add (buf, vp); /* add to previous value */
}
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);
}
char c, *cp, *dp;
char *vrsn;
- vrsn = add (hp->value, NULL);
+ vrsn = mh_xstrdup(FENDNULL(hp->value));
/* Now, cleanup this field */
cp = vrsn;
}
/* get copy of this field */
- ct->c_celine = cp = add (hp->value, NULL);
+ ct->c_celine = cp = mh_xstrdup(FENDNULL(hp->value));
while (isspace ((unsigned char) *cp))
cp++;
goto next_header;
}
- ep = cp = add (hp->value, NULL); /* get a copy */
+ ep = cp = mh_xstrdup(FENDNULL(hp->value)); /* get a copy */
while (isspace ((unsigned char) *cp))
cp++;
ci = &ct->c_ctinfo;
/* store copy of Content-Type line */
- cp = ct->c_ctline = add (cp, NULL);
+ cp = ct->c_ctline = mh_xstrdup(FENDNULL(cp));
while (isspace ((unsigned char) *cp)) /* trim leading spaces */
cp++;
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\")",
* Get any <Content-Id> given in buffer
*/
if (magic && *cp == '<') {
- mh_xfree(ct->c_id);
+ free(ct->c_id);
ct->c_id = NULL;
if (!(dp = strchr(ct->c_id = ++cp, '>'))) {
inform("invalid ID in message %s", ct->c_file);
}
}
else
- inform("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)", ct->c_file, TYPE_FIELD, cp);
}
return OK;
* time.
*/
- dispoheader = cp = add(cp, NULL);
+ dispoheader = cp = mh_xstrdup(FENDNULL(cp));
while (isspace ((unsigned char) *cp)) /* trim leading spaces */
cp++;
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) {
- inform("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)",
+ ct->c_file, DISPO_FIELD, cp);
}
if (buildflag)
bp = cte + strlen (cte) - 1;
while (bp >= cte && isspace ((unsigned char) *bp)) *bp-- = '\0';
- for (bp = cte; *bp && isblank ((unsigned char) *bp); ++bp) continue;
+ for (bp = cte; isblank((unsigned char)*bp); ++bp) continue;
inform("\"%s/%s\" type in message %s must be encoded in\n"
"7bit, 8bit, or binary, per RFC 2045 (6.4). "
if (! suppress_bogus_mp_content_warning) {
inform("bogus multipart content in message %s", ct->c_file);
}
- bogus_mp_content = 1;
+ bogus_mp_content = true;
if (!inout && part) {
p = part->mp_part;
}
static void
-move_preferred_part (CT ct, char *type, char *subtype)
+move_preferred_part(CT ct, mime_type_subtype *pref)
{
struct multipart *m = (struct multipart *) ct->c_ctparams;
struct part *part, *prev, *head, *nhead, *ntail;
part = head->mp_next;
while (part != NULL) {
ci = &part->mp_part->c_ctinfo;
- if (!strcasecmp(ci->ci_type, type) &&
- (!subtype || !strcasecmp(ci->ci_subtype, subtype))) {
+ if (!strcasecmp(ci->ci_type, pref->type) &&
+ (!pref->subtype ||
+ !strcasecmp(ci->ci_subtype, pref->subtype))) {
prev->mp_next = part->mp_next;
part->mp_next = NULL;
ntail->mp_next = part;
}
ntail->mp_next = head->mp_next;
m->mp_parts = nhead->mp_next;
-
}
/*
prefer_parts(CT ct)
{
int i;
- for (i = npreferred-1; i >= 0; i--)
- move_preferred_part(ct, preferred_types[i], preferred_subtypes[i]);
+ for (i = 0; i < npreferred; i++)
+ move_preferred_part(ct, mime_preference + i);
}
/* scan for parameters "id", "number", and "total" */
for (pm = ci->ci_first_pm; pm; pm = pm->pm_next) {
if (!strcasecmp (pm->pm_name, "id")) {
- p->pm_partid = add (pm->pm_value, NULL);
+ p->pm_partid = mh_xstrdup(FENDNULL(pm->pm_value));
continue;
}
if (!strcasecmp (pm->pm_name, "number")) {
*cp = '\0';
if (decodeBase64 (buffer, &decoded, &decoded_len, ct->c_type == CT_TEXT,
- ct->c_digested ? digest : NULL) == OK) {
+ ct->c_digested ? digest : NULL) != OK)
+ goto clean_up;
+
+ {
size_t i;
unsigned char *decoded_p = decoded;
for (i = 0; i < decoded_len; ++i) {
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 {
}
}
}
- } else {
- goto clean_up;
}
fseek (ct->c_fp, 0L, SEEK_SET);
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
- if (debugsw)
- fprintf (stderr, "content integrity confirmed\n");
+ else if (debugsw)
+ fprintf (stderr, "content integrity confirmed\n");
}
fseek (ce->ce_fp, 0L, SEEK_SET);
len = 0;
fprintf (ce->ce_fp, "%s: %s/%s", TYPE_FIELD, ci->ci_type, ci->ci_subtype);
- len += strlen (TYPE_FIELD) + 2 + strlen (ci->ci_type)
+ len += LEN(TYPE_FIELD) + 2 + strlen (ci->ci_type)
+ 1 + strlen (ci->ci_subtype);
buffer = output_params(len, ci->ci_first_pm, &len, 0);
goto ready_already;
}
- if (find_cache (ct, rcachesw, (int *) 0, cb->c_id,
+ if (find_cache(ct, rcachesw, NULL, cb->c_id,
cachefile, sizeof(cachefile)) != NOTOK) {
if ((ce->ce_fp = fopen (cachefile, "r"))) {
ce->ce_file = mh_xstrdup(cachefile);
admonish (cachefile, "unable to fopen for reading");
}
- *fd = fileno (ce->ce_fp);
+ *fd = ce->ce_fp ? fileno (ce->ce_fp) : -1;
return OK;
ready_already:
if (ferror (gp)) {
admonish (ce->ce_file, "error reading");
(void) m_unlink (cachefile);
- }
- else
- if (ferror (fp)) {
- admonish (cachefile, "error writing");
- (void) m_unlink (cachefile);
- }
+ } else if (ferror (fp)) {
+ admonish (cachefile, "error writing");
+ (void) m_unlink (cachefile);
+ }
fclose (fp);
}
umask (mask);
}
{
- int child_id, i, vecp;
+ int child_id, vecp;
char *vec[9];
vecp = 0;
fflush (stdout);
- for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
- sleep (5);
+ child_id = fork();
switch (child_id) {
case NOTOK:
adios ("fork", "unable to");
if (ferror (gp)) {
admonish (ce->ce_file, "error reading");
(void) m_unlink (cachefile);
- }
- else
- if (ferror (fp)) {
- admonish (cachefile, "error writing");
- (void) m_unlink (cachefile);
- }
+ } else if (ferror (fp)) {
+ admonish (cachefile, "error writing");
+ (void) m_unlink (cachefile);
+ }
fclose (fp);
}
umask (mask);
static int
openMail (CT ct, char **file)
{
- int child_id, fd, i, vecp;
+ int child_id, fd, vecp;
int len, buflen;
char *bp, buffer[BUFSIZ], *vec[7];
struct exbody *e = ct->c_ctexbody;
vec[vecp++] = e->eb_body;
vec[vecp] = NULL;
- for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
- sleep (5);
+ child_id = fork();
switch (child_id) {
case NOTOK:
advise ("fork", "unable to");
/* showproc is for mhshow and mhstore, though mhlist -debug
* prints it, too. */
- mh_xfree(ct->c_showproc);
+ free(ct->c_showproc);
ct->c_showproc = mh_xstrdup("true");
fseek (ce->ce_fp, 0L, SEEK_SET);
fseeko(ce->ce_fp, 0, SEEK_SET);
*file = ce->ce_file;
- return fd;
+ return fileno(ce->ce_fp);
}
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);
for (up = dp; isspace ((unsigned char) *dp);)
dp++;
if (dp == cp || *dp != '=') {
- 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);
+ inform("invalid parameter in message %s's %s: field\n"
+ " parameter %s (error detected at offset %ld)",
+ filename, fieldname, cp, (long)(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 {
- inform("invalid parameter index in message %s's "
- "%s: field\n%*s(parameter %s)", filename,
- fieldname, strlen(invo_name) + 2, "", cp);
+ inform("invalid parameter index in message %s's %s: field"
+ "\n (parameter %s)", filename, fieldname, cp);
return NOTOK;
}
} else {
}
vp++;
} else {
- inform("missing charset in message %s's %s: "
- "field\n%*s(parameter %s)", filename, fieldname,
- strlen(invo_name) + 2, "", nameptr);
+ inform("missing charset in message %s's %s: field\n"
+ " (parameter %s)", filename, fieldname, nameptr);
free(nameptr);
return NOTOK;
}
}
vp++;
} else {
- inform("missing language tag in message %s's %s: "
- "field\n%*s(parameter %s)", filename, fieldname,
- strlen(invo_name) + 2, "", nameptr);
+ inform("missing language tag in message %s's %s: field\n"
+ " (parameter %s)", filename, fieldname, nameptr);
free(nameptr);
- mh_xfree(charset);
+ free(charset);
return NOTOK;
}
!isxdigit((unsigned char) *(vp + 1)) ||
*(vp + 2) == '\0' ||
!isxdigit((unsigned char) *(vp + 2))) {
- inform("invalid encoded sequence in message "
- "%s's %s: field\n%*s(parameter %s)",
- filename, fieldname, strlen(invo_name) + 2,
- "", nameptr);
+ inform("invalid encoded sequence in message %s's %s: field\n"
+ " (parameter %s)", filename, fieldname, nameptr);
free(nameptr);
- mh_xfree(charset);
- mh_xfree(lang);
+ free(charset);
+ free(lang);
return NOTOK;
}
vp += 2;
switch (*cp++) {
case '\0':
bad_quote:
- inform("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"
+ " (parameter %s)", filename, fieldname, nameptr);
free(nameptr);
- mh_xfree(charset);
- mh_xfree(lang);
+ free(charset);
+ free(lang);
return NOTOK;
case '"':
break;
} else {
for (sp2 = pp->sechead; sp2 != NULL; sp2 = sp2->next) {
if (sp2->index == sp->index) {
- inform("duplicate index (%d) in message "
- "%s's %s: field\n%*s(parameter %s)", sp->index,
- filename, fieldname, strlen(invo_name) + 2, "",
- nameptr);
+ inform("duplicate index (%d) in message %s's %s: field"
+ "\n (parameter %s)", sp->index, filename,
+ fieldname, nameptr);
return NOTOK;
}
if (sp2->index < sp->index &&
}
if (sp2 == NULL) {
- inform("Internal error: cannot insert partial "
- "param in message %s's %s: field\n%*s(parameter %s)",
- filename, fieldname, strlen(invo_name) + 2, "",
- nameptr);
+ inform("Internal error: cannot insert partial param "
+ "in message %s's %s: field\n (parameter %s)",
+ filename, fieldname, nameptr);
return NOTOK;
}
}
*/
if (index == 0 && encoded) {
- mh_xfree(pp->charset);
+ free(pp->charset);
pp->charset = charset;
- mh_xfree(pp->lang);
+ free(pp->lang);
pp->lang = lang;
}
} else {
int pindex = 0;
for (sp = pp->sechead; sp != NULL; sp = sp->next) {
if (sp->index != pindex++) {
- 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);
+ inform("missing section %d for parameter in message "
+ "%s's %s: field\n (parameter %s)", pindex - 1,
+ filename, fieldname, pp->name);
return NOTOK;
}
tlen += sp->len;
if (strlen(params->pm_name) > CPERLIN) {
inform("Parameter name \"%s\" is too long", params->pm_name);
- mh_xfree(paramout);
+ free(paramout);
return NULL;
}
numchars, valoff);
if (i == 0) {
- mh_xfree(paramout);
+ free(paramout);
return NULL;
}
strlen(params->pm_value + valoff), valoff);
if (i == 0) {
- mh_xfree(paramout);
+ free(paramout);
return NULL;
}
projects / nmh / blobdiff