* 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 */
static int parse_header_attrs (const char *, const char *, char **, PM *,
PM *, char **);
static size_t param_len(PM, int, size_t, int *, int *, size_t *);
-static size_t encode_param(PM, char *, size_t, size_t, size_t, int);
static size_t normal_param(PM, char *, size_t, size_t, size_t);
static int get_dispo (char *, CT, int);
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) {
m_getfld_state_t gstate = 0;
/* allocate the content structure */
- if (!(ct = (CT) mh_xcalloc (1, sizeof(*ct))))
- adios (NULL, "out of memory");
-
+ NEW0(ct);
ct->c_fp = in;
ct->c_file = add (file, NULL);
ct->c_begin = ftell (ct->c_fp) + 1;
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) {
continue;
case BODY:
- ct->c_begin = ftell (in) - strlen (buf);
+ 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);
+ } else {
+ ct->c_begin = ftell (in) - (bufsz - 1);
+ }
break;
case FILEEOF:
HF hp;
/* allocate header field structure */
- hp = mh_xmalloc (sizeof(*hp));
+ NEW(hp);
/* link data into header structure */
hp->name = name;
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++)
- if (isalpha((unsigned char) *dp) && isupper ((unsigned char) *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++)
- if (isalpha((unsigned char) *dp) && isupper ((unsigned char) *dp))
- *dp = tolower ((unsigned char) *dp);
+ to_lower(ci->ci_subtype);
magic_skip:
while (isspace ((unsigned char) *cp))
* Get any <Content-Id> given in buffer
*/
if (magic && *cp == '<') {
- if (ct->c_id) {
- free (ct->c_id);
- ct->c_id = NULL;
- }
+ 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);
return NOTOK;
*/
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_subtype = ct_str_subtype (CT_TEXT, ci->ci_subtype);
/* allocate text character set structure */
- if ((t = (struct text *) mh_xcalloc (1, sizeof(*t))) == NULL)
- adios (NULL, "out of memory");
+ NEW0(t);
ct->c_ctparams = (void *) t;
/* scan for charset parameter */
if (chset != NULL && !check_charset (chset, strlen (chset))) {
snprintf (buffer, sizeof(buffer), "%s-charset-%s", invo_name, chset);
if ((cp = context_find (buffer)))
- ct->c_termproc = getcpy (cp);
+ ct->c_termproc = mh_xstrdup(cp);
}
return OK;
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';
}
/* allocate primary structure for multipart info */
- if ((m = (struct multipart *) mh_xcalloc (1, sizeof(*m))) == NULL)
- adios (NULL, "out of memory");
+ NEW0(m);
ct->c_ctparams = (void *) m;
/* check if boundary parameter contains only whitespace characters */
if (strcmp (bufp + 2, m->mp_start))
continue;
next_part:
- if ((part = (struct part *) mh_xcalloc (1, sizeof(*part))) == NULL)
- adios (NULL, "out of memory");
+ NEW0(part);
*next = part;
next = &part->mp_next;
if (inout)
goto next_part;
goto last_part;
- } else {
- if (strcmp (bufp + 2, m->mp_stop) == 0)
- goto end_part;
}
+ if (strcmp (bufp + 2, m->mp_stop) == 0)
+ goto end_part;
}
}
continue;
*next = NULL;
free_content (p);
- free ((char *) part);
+ free(part);
}
}
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) {
PM pm;
struct partial *p;
- if ((p = (struct partial *) mh_xcalloc (1, sizeof(*p))) == NULL)
- adios (NULL, "out of memory");
+ NEW0(p);
ct->c_ctparams = (void *) p;
/* scan for parameters "id", "number", and "total" */
CT p;
FILE *fp;
- if ((e = (struct exbody *) mh_xcalloc (1, sizeof(*e))) == NULL)
- adios (NULL, "out of memory");
+ NEW0(e);
ct->c_ctparams = (void *) e;
if (!ct->c_fp
if (ce->ce_file) {
if (stat (ce->ce_file, &st) != NOTOK)
return (long) st.st_size;
- else
- return 0L;
+ return 0L;
}
if (ct->c_encoding == CE_EXTERNAL)
/* sbeck -- handle suffixes */
CI ci;
CE ce = &ct->c_cefile;
- const char *decoded;
+ unsigned char *decoded;
size_t decoded_len;
unsigned char digest[16];
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 (decodeBase64 (buffer, &decoded, &decoded_len, ct->c_type == CT_TEXT,
ct->c_digested ? digest : NULL) == OK) {
size_t i;
- const char *decoded_p = decoded;
+ unsigned char *decoded_p = decoded;
for (i = 0; i < decoded_len; ++i) {
putc (*decoded_p++, ce->ce_fp);
}
- free ((char *) decoded);
+ free(decoded);
if (ferror (ce->ce_fp)) {
content_error (ce->ce_file, ct, "error writing to");
goto clean_up;
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 (find_cache (ct, rcachesw, (int *) 0, cb->c_id,
cachefile, sizeof(cachefile)) != NOTOK) {
if ((ce->ce_fp = fopen (cachefile, "r"))) {
- ce->ce_file = getcpy (cachefile);
+ ce->ce_file = mh_xstrdup(cachefile);
ce->ce_unlink = 0;
goto ready_already;
- } else {
- admonish (cachefile, "unable to fopen for reading");
}
+ admonish (cachefile, "unable to fopen for reading");
}
*fd = fileno (ce->ce_fp);
return NOTOK;
}
- ce->ce_file = getcpy (e->eb_name);
+ ce->ce_file = mh_xstrdup(e->eb_name);
ce->ce_unlink = 0;
if ((ce->ce_fp = fopen (ce->ce_file, "r")) == NULL) {
LocalName (1));
pass = buffer;
} else {
- ruserpass (e->eb_site, &username, &password);
+ ruserpass (e->eb_site, &username, &password, 0);
user = username;
pass = password;
}
}
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. */
- if (ct->c_showproc)
- free (ct->c_showproc);
- ct->c_showproc = add ("true", NULL);
+ mh_xfree(ct->c_showproc);
+ 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) {
static int
readDigest (CT ct, char *cp)
{
- const char *digest;
+ unsigned char *digest;
size_t len;
if (decodeBase64 (cp, &digest, &len, 0, NULL) == OK) {
const size_t maxlen = sizeof ct->c_digest / sizeof ct->c_digest[0];
- if (strlen (digest) <= maxlen) {
+ if (strlen ((char *) digest) <= maxlen) {
memcpy (ct->c_digest, digest, maxlen);
if (debugsw) {
}
return OK;
- } else {
- if (debugsw) {
- fprintf (stderr, "invalid MD5 digest (got %d octets)\n",
- (int) strlen (digest));
- }
-
- return NOTOK;
}
- } else {
+ if (debugsw) {
+ fprintf (stderr, "invalid MD5 digest (got %d octets)\n",
+ (int) strlen ((char *) digest));
+ }
+
return NOTOK;
}
+
+ return NOTOK;
}
"parameter list",
filename, fieldname);
}
- extraneous_trailing_semicolon = 1;
return DONE;
}
/* down case the attribute name */
for (dp = cp; istoken ((unsigned char) *dp); dp++)
- if (isalpha((unsigned char) *dp) && isupper ((unsigned char) *dp))
- *dp = tolower ((unsigned char) *dp);
+ *dp = tolower ((unsigned char) *dp);
for (up = dp; isspace ((unsigned char) *dp);)
dp++;
"field\n%*s(parameter %s)", filename, fieldname,
strlen(invo_name) + 2, "", nameptr);
free(nameptr);
- if (charset)
- free(charset);
+ mh_xfree(charset);
return NOTOK;
}
filename, fieldname, strlen(invo_name) + 2,
"", nameptr);
free(nameptr);
- if (charset)
- free(charset);
- if (lang)
- free(lang);
+ mh_xfree(charset);
+ mh_xfree(lang);
return NOTOK;
}
vp += 2;
filename, fieldname, strlen(invo_name) + 2, "",
nameptr);
free(nameptr);
- if (charset)
- free(charset);
- if (lang)
- free(lang);
+ mh_xfree(charset);
+ mh_xfree(lang);
return NOTOK;
case '"':
break;
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) {
- pp = mh_xmalloc(sizeof(*pp));
- memset(pp, 0, sizeof(*pp));
+ NEW0(pp);
pp->name = nameptr;
pp->next = phead;
phead = pp;
* Insert this into the section linked list
*/
- sp = mh_xmalloc(sizeof(*sp));
- memset(sp, 0, sizeof(*sp));
+ NEW0(sp);
sp->value = valptr;
sp->index = index;
sp->len = len;
"%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;
}
}
*/
if (index == 0 && encoded) {
- if (pp->charset)
- free(pp->charset);
+ mh_xfree(pp->charset);
pp->charset = charset;
- if (pp->lang)
- free(pp->lang);
+ mh_xfree(pp->lang);
pp->lang = lang;
}
} else {
ret_charset = get_param(ct->c_ctinfo.ci_first_pm, "charset", '?', 0);
- return ret_charset ? ret_charset : getcpy ("US-ASCII");
+ return ret_charset ? ret_charset : mh_xstrdup("US-ASCII");
}
if (strlen(params->pm_name) > CPERLIN) {
advise(NULL, "Parameter name \"%s\" is too long", params->pm_name);
- if (paramout)
- free(paramout);
+ mh_xfree(paramout);
return NULL;
}
numchars, valoff);
if (i == 0) {
- if (paramout)
- free(paramout);
+ mh_xfree(paramout);
return NULL;
}
strlen(params->pm_value + valoff), valoff);
if (i == 0) {
- if (paramout)
- free(paramout);
+ mh_xfree(paramout);
return NULL;
}
*/
if (! pm->pm_charset) {
- pm->pm_charset = getcpy(write_charset_8bit());
+ pm->pm_charset = mh_xstrdup(write_charset_8bit());
if (strcasecmp(pm->pm_charset, "US-ASCII") == 0)
adios(NULL, "8-bit characters in parameter \"%s\", but "
"local character set is US-ASCII", pm->pm_name);
}
if (! pm->pm_lang)
- pm->pm_lang = getcpy(NULL); /* Default to a blank lang tag */
+ pm->pm_lang = mh_xstrdup(""); /* Default to a blank lang tag */
len++; /* For the encoding marker */
maxfit--;
* Output an encoded parameter string.
*/
-static size_t
+size_t
encode_param(PM pm, char *output, size_t len, size_t valuelen,
size_t valueoff, int index)
{
PM
add_param(PM *first, PM *last, char *name, char *value, int nocopy)
{
- PM pm = mh_xmalloc(sizeof(*pm));
-
- memset(pm, 0, sizeof(*pm));
+ PM pm;
+ NEW0(pm);
pm->pm_name = nocopy ? name : getcpy(name);
pm->pm_value = nocopy ? value : getcpy(value);
if (strcasecmp(name, first->pm_name) == 0) {
if (fetchonly)
return first->pm_value;
- else
- return getcpy(get_param_value(first, replace));
+ return getcpy(get_param_value(first, replace));
}
first = first->pm_next;
}
#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--) {
- 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