#include <fcntl.h>
#include <h/signals.h>
#include <h/md5.h>
-#include <errno.h>
-#include <signal.h>
#include <h/mts.h>
#include <h/tws.h>
#include <h/mime.h>
int checksw = 0; /* check Content-MD5 field */
-/*
- * Directory to place temp files. This must
- * be set before these routines are called.
- */
-char *tmp;
-
/*
* These are for mhfixmsg to:
* 1) Instruct parser not to detect invalid Content-Transfer-Encoding
{ NULL, APPLICATION_UNKNOWN } /* this one must be last! */
};
+/*
+ * Mapping of names of CTE types in mhbuild directives
+ */
+static struct k2v EncodingType[] = {
+ { "8bit", CE_8BIT },
+ { "qp", CE_QUOTED },
+ { "q-p", CE_QUOTED },
+ { "quoted-printable", CE_QUOTED },
+ { "b64", CE_BASE64 },
+ { "base64", CE_BASE64 },
+ { NULL, 0 },
+};
+
/* mhcachesbr.c */
int find_cache (CT, int, int *, char *, char *, int);
* static prototypes
*/
static CT get_content (FILE *, char *, int);
-static int get_comment (CT, char **, int);
+static int get_comment (const char *, CI, char **, int);
static int InitGeneric (CT);
static int InitText (CT);
static int get_leftover_mp_content (CT, int);
static int InitURL (CT);
static int openURL (CT, char **);
+static size_t param_len(PM, int, size_t, int *);
struct str2init str2cts[] = {
{ "application", CT_APPLICATION, InitApplication },
if ((is_stdin = !(strcmp (file, "-")))) {
char *tfile = m_mktemp2(NULL, invo_name, NULL, &fp);
if (tfile == NULL) {
- advise("mhparse", "unable to create temporary file");
+ advise("mhparse", "unable to create temporary file in %s",
+ get_temp_dir());
return NULL;
}
file = add (tfile, NULL);
- chmod (file, 0600);
while (fgets (buffer, sizeof(buffer), stdin))
fputs (buffer, fp);
fflush (fp);
if (ferror (stdin)) {
- unlink (file);
+ (void) m_unlink (file);
advise ("stdin", "error reading");
return NULL;
}
if (ferror (fp)) {
- unlink (file);
+ (void) m_unlink (file);
advise (file, "error writing");
return NULL;
}
if (!(ct = get_content (fp, file, 1))) {
if (is_stdin)
- unlink (file);
+ (void) m_unlink (file);
advise (NULL, "unable to decode %s", file);
return NULL;
}
hp = ct->c_first_hf; /* start at first header field */
while (hp) {
/* Get MIME-Version field */
- if (!mh_strcasecmp (hp->name, VRSN_FIELD)) {
+ if (!strcasecmp (hp->name, VRSN_FIELD)) {
int ucmp;
char c, *cp, *dp;
if (debugsw)
fprintf (stderr, "%s: %s\n", VRSN_FIELD, cp);
- if (*cp == '(' && get_comment (ct, &cp, 0) == NOTOK)
+ if (*cp == '(' &&
+ get_comment (ct->c_file, &ct->c_ctinfo, &cp, 0) == NOTOK)
goto out;
for (dp = cp; istoken (*dp); dp++)
continue;
c = *dp;
*dp = '\0';
- ucmp = !mh_strcasecmp (cp, VRSN_VALUE);
+ ucmp = !strcasecmp (cp, VRSN_VALUE);
*dp = c;
if (!ucmp) {
admonish (NULL, "message %s has unknown value for %s: field (%s)",
ct->c_file, VRSN_FIELD, cp);
}
}
- else if (!mh_strcasecmp (hp->name, TYPE_FIELD)) {
+ else if (!strcasecmp (hp->name, TYPE_FIELD)) {
/* Get Content-Type field */
struct str2init *s2i;
CI ci = &ct->c_ctinfo;
* flag for this content type.
*/
for (s2i = str2cts; s2i->si_key; s2i++)
- if (!mh_strcasecmp (ci->ci_type, s2i->si_key))
+ if (!strcasecmp (ci->ci_type, s2i->si_key))
break;
if (!s2i->si_key && !uprf (ci->ci_type, "X-"))
s2i++;
ct->c_type = s2i->si_val;
ct->c_ctinitfnx = s2i->si_init;
}
- else if (!mh_strcasecmp (hp->name, ENCODING_FIELD)) {
+ else if (!strcasecmp (hp->name, ENCODING_FIELD)) {
/* Get Content-Transfer-Encoding field */
char c, *cp, *dp;
struct str2init *s2i;
* for this transfer encoding.
*/
for (s2i = str2ces; s2i->si_key; s2i++)
- if (!mh_strcasecmp (cp, s2i->si_key))
+ if (!strcasecmp (cp, s2i->si_key))
break;
if (!s2i->si_key && !uprf (cp, "X-"))
s2i++;
if (s2i->si_init && (*s2i->si_init) (ct) == NOTOK)
goto out;
}
- else if (!mh_strcasecmp (hp->name, MD5_FIELD)) {
+ else if (!strcasecmp (hp->name, MD5_FIELD)) {
/* Get Content-MD5 field */
char *cp, *dp, *ep;
if (debugsw)
fprintf (stderr, "%s: %s\n", MD5_FIELD, cp);
- if (*cp == '(' && get_comment (ct, &cp, 0) == NOTOK) {
+ if (*cp == '(' &&
+ get_comment (ct->c_file, &ct->c_ctinfo, &cp, 0) == NOTOK) {
free (ep);
goto out;
}
free (ep);
ct->c_digested++;
}
- else if (!mh_strcasecmp (hp->name, ID_FIELD)) {
+ else if (!strcasecmp (hp->name, ID_FIELD)) {
/* Get Content-ID field */
ct->c_id = add (hp->value, ct->c_id);
}
- else if (!mh_strcasecmp (hp->name, DESCR_FIELD)) {
+ else if (!strcasecmp (hp->name, DESCR_FIELD)) {
/* Get Content-Description field */
ct->c_descr = add (hp->value, ct->c_descr);
}
- else if (!mh_strcasecmp (hp->name, DISPO_FIELD)) {
+ else if (!strcasecmp (hp->name, DISPO_FIELD)) {
/* Get Content-Disposition field */
ct->c_dispo = add (hp->value, ct->c_dispo);
}
get_ctinfo (char *cp, CT ct, int magic)
{
int i;
- char *dp, **ap, **ep;
+ char *dp;
char c;
CI ci;
+ int status;
ci = &ct->c_ctinfo;
i = strlen (invo_name) + 2;
if (debugsw)
fprintf (stderr, "%s: %s\n", TYPE_FIELD, cp);
- if (*cp == '(' && get_comment (ct, &cp, 1) == NOTOK)
+ if (*cp == '(' && get_comment (ct->c_file, &ct->c_ctinfo, &cp, 1) == NOTOK)
return NOTOK;
for (dp = cp; istoken (*dp); dp++)
while (isspace ((unsigned char) *cp))
cp++;
- if (*cp == '(' && get_comment (ct, &cp, 1) == NOTOK)
+ if (*cp == '(' && get_comment (ct->c_file, &ct->c_ctinfo, &cp, 1) == NOTOK)
return NOTOK;
if (*cp != '/') {
while (isspace ((unsigned char) *cp))
cp++;
- if (*cp == '(' && get_comment (ct, &cp, 1) == NOTOK)
+ if (*cp == '(' && get_comment (ct->c_file, &ct->c_ctinfo, &cp, 1) == NOTOK)
return NOTOK;
for (dp = cp; istoken (*dp); dp++)
while (isspace ((unsigned char) *cp))
cp++;
- if (*cp == '(' && get_comment (ct, &cp, 1) == NOTOK)
+ if (*cp == '(' && get_comment (ct->c_file, &ct->c_ctinfo, &cp, 1) == NOTOK)
return NOTOK;
- /*
- * Parse attribute/value pairs given with Content-Type
- */
- ep = (ap = ci->ci_attrs) + NPARMS;
- while (*cp == ';') {
- char *vp, *up;
-
- if (ap >= ep) {
- advise (NULL,
- "too many parameters in message %s's %s: field (%d max)",
- ct->c_file, TYPE_FIELD, NPARMS);
- return NOTOK;
- }
-
- cp++;
- while (isspace ((unsigned char) *cp))
- cp++;
-
- if (*cp == '(' && get_comment (ct, &cp, 1) == NOTOK)
- return NOTOK;
-
- if (*cp == 0) {
- advise (NULL,
- "extraneous trailing ';' in message %s's %s: parameter list",
- ct->c_file, TYPE_FIELD);
- return OK;
- }
-
- /* 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);
-
- 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)",
- ct->c_file, TYPE_FIELD, i, i, "", cp, dp - cp);
- return NOTOK;
- }
-
- vp = (*ap = add (cp, NULL)) + (up - cp);
- *vp = '\0';
- for (dp++; isspace ((unsigned char) *dp);)
- dp++;
-
- /* now add the attribute value */
- ci->ci_values[ap - ci->ci_attrs] = vp = *ap + (dp - cp);
-
- if (*dp == '"') {
- for (cp = ++dp, dp = vp;;) {
- switch (c = *cp++) {
- case '\0':
-bad_quote:
- advise (NULL,
- "invalid quoted-string in message %s's %s: field\n%*.*s(parameter %s)",
- ct->c_file, TYPE_FIELD, i, i, "", *ap);
- return NOTOK;
-
- case '\\':
- *dp++ = c;
- if ((c = *cp++) == '\0')
- goto bad_quote;
- /* else fall... */
-
- default:
- *dp++ = c;
- continue;
-
- case '"':
- *dp = '\0';
- break;
- }
- break;
- }
- } else {
- for (cp = dp, dp = vp; istoken (*cp); cp++, dp++)
- continue;
- *dp = '\0';
- }
- if (!*vp) {
- advise (NULL,
- "invalid parameter in message %s's %s: field\n%*.*s(parameter %s)",
- ct->c_file, TYPE_FIELD, i, i, "", *ap);
- return NOTOK;
- }
- ap++;
-
- while (isspace ((unsigned char) *cp))
- cp++;
-
- if (*cp == '(' && get_comment (ct, &cp, 1) == NOTOK)
- return NOTOK;
+ if (parse_header_attrs (ct->c_file, i, &cp, ci, &status) == NOTOK) {
+ return status;
}
/*
cp++;
}
+ /*
+ * Get any extension directives (right now just the content transfer
+ * encoding, but maybe others) that we care about.
+ */
+
+ if (magic && *cp == '*') {
+ /*
+ * See if it's a CTE we match on
+ */
+ struct k2v *kv;
+
+ dp = ++cp;
+ while (*cp != '\0' && ! isspace((unsigned char) *cp))
+ cp++;
+
+ if (dp == cp) {
+ advise (NULL, "invalid null transfer encoding specification");
+ return NOTOK;
+ }
+
+ if (*cp != '\0')
+ *cp++ = '\0';
+
+ ct->c_reqencoding = CE_UNKNOWN;
+
+ for (kv = EncodingType; kv->kv_key; kv++) {
+ if (strcasecmp(kv->kv_key, dp) == 0) {
+ ct->c_reqencoding = kv->kv_value;
+ break;
+ }
+ }
+
+ if (ct->c_reqencoding == CE_UNKNOWN) {
+ advise (NULL, "invalid CTE specification: \"%s\"", dp);
+ return NOTOK;
+ }
+
+ while (isspace ((unsigned char) *cp))
+ cp++;
+ }
+
/*
* Check if anything is left over
*/
static int
-get_comment (CT ct, char **ap, int istype)
+get_comment (const char *filename, CI ci, char **ap, int istype)
{
int i;
char *bp, *cp;
char c, buffer[BUFSIZ], *dp;
- CI ci;
- ci = &ct->c_ctinfo;
cp = *ap;
bp = buffer;
cp++;
case '\0':
invalid:
advise (NULL, "invalid comment in message %s's %s: field",
- ct->c_file, istype ? TYPE_FIELD : VRSN_FIELD);
+ filename, istype ? TYPE_FIELD : VRSN_FIELD);
return NOTOK;
case '\\':
{
char buffer[BUFSIZ];
char *chset = NULL;
- char **ap, **ep, *cp;
+ char *cp;
+ PM pm;
struct k2v *kv;
struct text *t;
CI ci = &ct->c_ctinfo;
/* match subtype */
for (kv = SubText; kv->kv_key; kv++)
- if (!mh_strcasecmp (ci->ci_subtype, kv->kv_key))
+ if (!strcasecmp (ci->ci_subtype, kv->kv_key))
break;
ct->c_subtype = kv->kv_value;
ct->c_ctparams = (void *) t;
/* scan for charset parameter */
- for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++)
- if (!mh_strcasecmp (*ap, "charset"))
+ for (pm = ci->ci_first_pm; pm; pm = pm->pm_next)
+ if (!strcasecmp (pm->pm_name, "charset"))
break;
/* check if content specified a character set */
- if (*ap) {
- chset = *ep;
+ if (pm) {
+ chset = pm->pm_value;
t->tx_charset = CHARSET_SPECIFIED;
} else {
t->tx_charset = CHARSET_UNSPECIFIED;
{
int inout;
long last, pos;
- char *cp, *dp, **ap, **ep;
+ char *cp, *dp;
+ PM pm;
char *bp, buffer[BUFSIZ];
struct multipart *m;
struct k2v *kv;
/* match subtype */
for (kv = SubMultiPart; kv->kv_key; kv++)
- if (!mh_strcasecmp (ci->ci_subtype, kv->kv_key))
+ if (!strcasecmp (ci->ci_subtype, kv->kv_key))
break;
ct->c_subtype = kv->kv_value;
* required for multipart messages.
*/
bp = 0;
- for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) {
- if (!mh_strcasecmp (*ap, "boundary")) {
- bp = *ep;
+ for (pm = ci->ci_first_pm; pm; pm = pm->pm_next) {
+ if (!strcasecmp (pm->pm_name, "boundary")) {
+ bp = pm->pm_value;
break;
}
}
/* complain if boundary parameter is missing */
- if (!*ap) {
+ 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);
/* match subtype */
for (kv = SubMessage; kv->kv_key; kv++)
- if (!mh_strcasecmp (ci->ci_subtype, kv->kv_key))
+ if (!strcasecmp (ci->ci_subtype, kv->kv_key))
break;
ct->c_subtype = kv->kv_value;
case MESSAGE_PARTIAL:
{
- char **ap, **ep;
+ PM pm;
struct partial *p;
if ((p = (struct partial *) calloc (1, sizeof(*p))) == NULL)
ct->c_ctparams = (void *) p;
/* scan for parameters "id", "number", and "total" */
- for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) {
- if (!mh_strcasecmp (*ap, "id")) {
- p->pm_partid = add (*ep, NULL);
+ 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);
continue;
}
- if (!mh_strcasecmp (*ap, "number")) {
- if (sscanf (*ep, "%d", &p->pm_partno) != 1
+ if (!strcasecmp (pm->pm_name, "number")) {
+ 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",
- *ap, ci->ci_type, ci->ci_subtype,
+ pm->pm_name, ci->ci_type, ci->ci_subtype,
ct->c_file, TYPE_FIELD);
return NOTOK;
}
continue;
}
- if (!mh_strcasecmp (*ap, "total")) {
- if (sscanf (*ep, "%d", &p->pm_maxno) != 1
+ if (!strcasecmp (pm->pm_name, "total")) {
+ if (sscanf (pm->pm_value, "%d", &p->pm_maxno) != 1
|| p->pm_maxno < 1)
goto invalid_param;
continue;
int
params_external (CT ct, int composing)
{
- char **ap, **ep;
+ PM pm;
struct exbody *e = (struct exbody *) ct->c_ctparams;
CI ci = &ct->c_ctinfo;
ct->c_ceopenfnx = NULL;
- for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) {
- if (!mh_strcasecmp (*ap, "access-type")) {
+ for (pm = ci->ci_first_pm; pm; pm = pm->pm_next) {
+ if (!strcasecmp (pm->pm_name, "access-type")) {
struct str2init *s2i;
CT p = e->eb_content;
for (s2i = str2methods; s2i->si_key; s2i++)
- if (!mh_strcasecmp (*ep, s2i->si_key))
+ if (!strcasecmp (pm->pm_value, s2i->si_key))
break;
if (!s2i->si_key) {
- e->eb_access = *ep;
+ e->eb_access = pm->pm_value;
e->eb_flags = NOTOK;
p->c_encoding = CE_EXTERNAL;
continue;
return NOTOK;
continue;
}
- if (!mh_strcasecmp (*ap, "name")) {
- e->eb_name = *ep;
+ if (!strcasecmp (pm->pm_name, "name")) {
+ e->eb_name = pm->pm_value;
continue;
}
- if (!mh_strcasecmp (*ap, "permission")) {
- e->eb_permission = *ep;
+ if (!strcasecmp (pm->pm_name, "permission")) {
+ e->eb_permission = pm->pm_value;
continue;
}
- if (!mh_strcasecmp (*ap, "site")) {
- e->eb_site = *ep;
+ if (!strcasecmp (pm->pm_name, "site")) {
+ e->eb_site = pm->pm_value;
continue;
}
- if (!mh_strcasecmp (*ap, "directory")) {
- e->eb_dir = *ep;
+ if (!strcasecmp (pm->pm_name, "directory")) {
+ e->eb_dir = pm->pm_value;
continue;
}
- if (!mh_strcasecmp (*ap, "mode")) {
- e->eb_mode = *ep;
+ if (!strcasecmp (pm->pm_name, "mode")) {
+ e->eb_mode = pm->pm_value;
continue;
}
- if (!mh_strcasecmp (*ap, "size")) {
- sscanf (*ep, "%lu", &e->eb_size);
+ if (!strcasecmp (pm->pm_name, "size")) {
+ sscanf (pm->pm_value, "%lu", &e->eb_size);
continue;
}
- if (!mh_strcasecmp (*ap, "server")) {
- e->eb_server = *ep;
+ if (!strcasecmp (pm->pm_name, "server")) {
+ e->eb_server = pm->pm_value;
continue;
}
- if (!mh_strcasecmp (*ap, "subject")) {
- e->eb_subject = *ep;
+ if (!strcasecmp (pm->pm_name, "subject")) {
+ e->eb_subject = pm->pm_value;
continue;
}
- if (!mh_strcasecmp (*ap, "url")) {
+ if (!strcasecmp (pm->pm_name, "url")) {
/*
* According to RFC 2017, we have to remove all whitespace from
* the URL
*/
- char *u, *p = *ep;
- e->eb_url = u = mh_xmalloc(strlen(*ep) + 1);
+ char *u, *p = pm->pm_value;
+ e->eb_url = u = mh_xmalloc(strlen(pm->pm_value) + 1);
for (; *p != '\0'; p++) {
if (! isspace((unsigned char) *p))
*u = '\0';
continue;
}
- if (composing && !mh_strcasecmp (*ap, "body")) {
- e->eb_body = getcpy (*ep);
+ if (composing && !strcasecmp (pm->pm_name, "body")) {
+ e->eb_body = getcpy (pm->pm_value);
continue;
}
}
/* match subtype */
for (kv = SubApplication; kv->kv_key; kv++)
- if (!mh_strcasecmp (ci->ci_subtype, kv->kv_key))
+ if (!strcasecmp (ci->ci_subtype, kv->kv_key))
break;
ct->c_subtype = kv->kv_value;
static int
init_encoding (CT ct, OpenCEFunc openfnx)
{
- CE ce;
-
- if ((ce = (CE) calloc (1, sizeof(*ce))) == NULL)
- adios (NULL, "out of memory");
-
- ct->c_cefile = ce;
ct->c_ceopenfnx = openfnx;
ct->c_ceclosefnx = close_encoding;
ct->c_cesizefnx = size_encoding;
void
close_encoding (CT ct)
{
- CE ce;
-
- if (!(ce = ct->c_cefile))
- return;
+ CE ce = &ct->c_cefile;
if (ce->ce_fp) {
fclose (ce->ce_fp);
int fd;
unsigned long size;
char *file;
- CE ce;
+ CE ce = &ct->c_cefile;
struct stat st;
- if (!(ce = ct->c_cefile))
- return (ct->c_end - ct->c_begin);
-
if (ce->ce_fp && fstat (fileno (ce->ce_fp), &st) != NOTOK)
return (long) st.st_size;
openBase64 (CT ct, char **file)
{
int bitno, cc, digested;
- int fd, len, skip, own_ct_fp = 0;
+ int fd, len, skip, own_ct_fp = 0, text = ct->c_type == CT_TEXT;
uint32_t bits;
unsigned char value, b;
char *cp, *ep, buffer[BUFSIZ];
/* sbeck -- handle suffixes */
CI ci;
- CE ce;
+ CE ce = &ct->c_cefile;
MD5_CTX mdContext;
- ce = ct->c_cefile;
if (ce->ce_fp) {
fseek (ce->ce_fp, 0L, SEEK_SET);
goto ready_to_go;
}
if (*file == NULL) {
- ce->ce_file = add (m_mktemp(tmp, NULL, NULL), NULL);
ce->ce_unlink = 1;
} else {
ce->ce_file = add (*file, NULL);
cp = context_find (buffer);
}
if (cp != NULL && *cp != '\0') {
- if (ce->ce_unlink) {
- /* Temporary file already exists, so we rename to
- version with extension. */
- char *file_org = strdup(ce->ce_file);
- ce->ce_file = add (cp, ce->ce_file);
- if (rename(file_org, ce->ce_file)) {
- adios (ce->ce_file, "unable to rename %s to ", file_org);
- }
- free(file_org);
-
- } else {
- ce->ce_file = add (cp, ce->ce_file);
- }
+ if (ce->ce_unlink) {
+ /* Create temporary file with filename extension. */
+ if ((ce->ce_file = m_mktemps(invo_name, cp, NULL, NULL)) == NULL) {
+ adios(NULL, "unable to create temporary file in %s",
+ get_temp_dir());
+ }
+ } else {
+ ce->ce_file = add (cp, ce->ce_file);
+ }
+ } else if (*file == NULL) {
+ 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);
}
if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
test_end:
if ((bitno -= 6) < 0) {
b = (bits >> 16) & 0xff;
- putc ((char) b, ce->ce_fp);
+ if (!text || b != '\r')
+ putc ((char) b, ce->ce_fp);
if (digested)
MD5Update (&mdContext, &b, 1);
if (skip < 2) {
b = (bits >> 8) & 0xff;
- putc ((char) b, ce->ce_fp);
+ if (! text || b != '\r')
+ putc ((char) b, ce->ce_fp);
if (digested)
MD5Update (&mdContext, &b, 1);
if (skip < 1) {
b = bits & 0xff;
- putc ((char) b, ce->ce_fp);
+ if (! text || b != '\r')
+ putc ((char) b, ce->ce_fp);
if (digested)
MD5Update (&mdContext, &b, 1);
}
char *cp, *ep;
char buffer[BUFSIZ];
unsigned char mask;
- CE ce;
+ CE ce = &ct->c_cefile;
/* sbeck -- handle suffixes */
CI ci;
MD5_CTX mdContext;
- ce = ct->c_cefile;
if (ce->ce_fp) {
fseek (ce->ce_fp, 0L, SEEK_SET);
goto ready_to_go;
}
if (*file == NULL) {
- ce->ce_file = add (m_mktemp(tmp, NULL, NULL), NULL);
ce->ce_unlink = 1;
} else {
ce->ce_file = add (*file, NULL);
cp = context_find (buffer);
}
if (cp != NULL && *cp != '\0') {
- if (ce->ce_unlink) {
- /* Temporary file already exists, so we rename to
- version with extension. */
- char *file_org = strdup(ce->ce_file);
- ce->ce_file = add (cp, ce->ce_file);
- if (rename(file_org, ce->ce_file)) {
- adios (ce->ce_file, "unable to rename %s to ", file_org);
- }
- free(file_org);
-
- } else {
- ce->ce_file = add (cp, ce->ce_file);
- }
+ if (ce->ce_unlink) {
+ /* Create temporary file with filename extension. */
+ if ((ce->ce_file = m_mktemps(invo_name, cp, NULL, NULL)) == NULL) {
+ adios(NULL, "unable to create temporary file in %s",
+ get_temp_dir());
+ }
+ } else {
+ ce->ce_file = add (cp, ce->ce_file);
+ }
+ } else if (*file == NULL) {
+ 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);
}
if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
/* sbeck -- handle suffixes */
char *cp;
CI ci;
- CE ce;
+ CE ce = &ct->c_cefile;
- ce = ct->c_cefile;
if (ce->ce_fp) {
fseek (ce->ce_fp, 0L, SEEK_SET);
goto ready_to_go;
}
if (*file == NULL) {
- ce->ce_file = add (m_mktemp(tmp, NULL, NULL), NULL);
ce->ce_unlink = 1;
} else {
ce->ce_file = add (*file, NULL);
cp = context_find (buffer);
}
if (cp != NULL && *cp != '\0') {
- if (ce->ce_unlink) {
- /* Temporary file already exists, so we rename to
- version with extension. */
- char *file_org = strdup(ce->ce_file);
- ce->ce_file = add (cp, ce->ce_file);
- if (rename(file_org, ce->ce_file)) {
- adios (ce->ce_file, "unable to rename %s to ", file_org);
- }
- free(file_org);
-
- } else {
- ce->ce_file = add (cp, ce->ce_file);
- }
+ if (ce->ce_unlink) {
+ /* Create temporary file with filename extension. */
+ if ((ce->ce_file = m_mktemps(invo_name, cp, NULL, NULL)) == NULL) {
+ adios(NULL, "unable to create temporary file in %s",
+ get_temp_dir());
+ }
+ } else {
+ ce->ce_file = add (cp, ce->ce_file);
+ }
+ } else if (*file == NULL) {
+ 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);
}
if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
}
if (ct->c_type == CT_MULTIPART) {
- char **ap, **ep;
+ PM pm;
CI ci = &ct->c_ctinfo;
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)
+ 1 + strlen (ci->ci_subtype);
- for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) {
+ for (pm = ci->ci_first_pm; pm; pm = pm->pm_next) {
putc (';', ce->ce_fp);
len++;
- snprintf (buffer, sizeof(buffer), "%s=\"%s\"", *ap, *ep);
+ snprintf (buffer, sizeof(buffer), "%s=\"%s\"", , *ep);
if (len + 1 + (cc = strlen (buffer)) >= CPERLIN) {
fputs ("\n\t", ce->ce_fp);
int fd, cachetype;
char cachefile[BUFSIZ];
struct exbody *e = ct->c_ctexbody;
- CE ce = ct->c_cefile;
+ CE ce = &ct->c_cefile;
switch (openExternal (e->eb_parent, e->eb_content, ce, file, &fd)) {
case NOTOK:
return NOTOK;
}
- if ((!e->eb_permission || mh_strcasecmp (e->eb_permission, "read-write"))
+ if ((!e->eb_permission || strcasecmp (e->eb_permission, "read-write"))
&& find_cache (NULL, wcachesw, &cachetype, e->eb_content->c_id,
cachefile, sizeof(cachefile)) != NOTOK) {
int mask;
if (ferror (gp)) {
admonish (ce->ce_file, "error reading");
- unlink (cachefile);
+ (void) m_unlink (cachefile);
}
else
if (ferror (fp)) {
admonish (cachefile, "error writing");
- unlink (cachefile);
+ (void) m_unlink (cachefile);
}
fclose (fp);
}
char *bp, *ftp, *user, *pass;
char buffer[BUFSIZ], cachefile[BUFSIZ];
struct exbody *e;
- CE ce;
+ CE ce = &ct->c_cefile;
static char *username = NULL;
static char *password = NULL;
e = ct->c_ctexbody;
- ce = ct->c_cefile;
if ((ftp = context_find (nmhaccessftp)) && !*ftp)
ftp = NULL;
ce->ce_unlink = (*file == NULL);
caching = 0;
cachefile[0] = '\0';
- if ((!e->eb_permission || mh_strcasecmp (e->eb_permission, "read-write"))
+ if ((!e->eb_permission || strcasecmp (e->eb_permission, "read-write"))
&& find_cache (NULL, wcachesw, &cachetype, e->eb_content->c_id,
cachefile, sizeof(cachefile)) != NOTOK) {
if (*file == NULL) {
ce->ce_file = add (*file, NULL);
else if (caching)
ce->ce_file = add (cachefile, NULL);
- else
- ce->ce_file = add (m_mktemp(tmp, NULL, NULL), NULL);
+ 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);
+ }
if ((ce->ce_fp = fopen (ce->ce_file, "w+")) == NULL) {
content_error (ce->ce_file, ct, "unable to fopen for reading/writing");
vec[vecp++] = e->eb_dir;
vec[vecp++] = e->eb_name;
vec[vecp++] = ce->ce_file,
- vec[vecp++] = e->eb_mode && !mh_strcasecmp (e->eb_mode, "ascii")
+ vec[vecp++] = e->eb_mode && !strcasecmp (e->eb_mode, "ascii")
? "ascii" : "binary";
vec[vecp] = NULL;
if (ferror (gp)) {
admonish (ce->ce_file, "error reading");
- unlink (cachefile);
+ (void) m_unlink (cachefile);
}
else
if (ferror (fp)) {
admonish (cachefile, "error writing");
- unlink (cachefile);
+ (void) m_unlink (cachefile);
}
fclose (fp);
}
int len, buflen;
char *bp, buffer[BUFSIZ], *vec[7];
struct exbody *e = ct->c_ctexbody;
- CE ce = ct->c_cefile;
+ CE ce = &ct->c_cefile;
switch (openExternal (e->eb_parent, e->eb_content, ce, file, &fd)) {
case NOTOK:
}
if (*file == NULL) {
- ce->ce_file = add (m_mktemp(tmp, NULL, NULL), NULL);
+ 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_unlink = 1;
} else {
ce->ce_file = add (*file, NULL);
openURL (CT ct, char **file)
{
struct exbody *e = ct->c_ctexbody;
- CE ce = ct->c_cefile;
+ CE ce = &ct->c_cefile;
char *urlprog, *program;
char buffer[BUFSIZ], cachefile[BUFSIZ];
int fd, caching, cachetype;
ce->ce_file = add(*file, NULL);
else if (caching)
ce->ce_file = add(cachefile, NULL);
- else
- ce->ce_file = add(m_mktemp(tmp, NULL, NULL), NULL);
+ 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);
+ }
if ((ce->ce_fp = fopen(ce->ce_file, "w+")) == NULL) {
content_error(ce->ce_file, ct, "unable to fopen for read/writing");
if (ferror(gp)) {
admonish(ce->ce_file, "error reading");
- unlink(cachefile);
+ (void) m_unlink (cachefile);
}
}
umask(mask);
case CE_BASE64:
return "base64";
case CE_QUOTED:
- return "quoted";
+ return "quoted-printable";
case CE_8BIT:
return "8bit";
case CE_7BIT:
return NULL;
}
+
+int
+parse_header_attrs (const char *filename, int len, char **header_attrp, CI ci,
+ int *status) {
+ char **attr = ci->ci_attrs;
+ char *cp = *header_attrp;
+
+ while (*cp == ';') {
+ char *dp, *vp, *up, c;
+
+ /* Relies on knowledge of this declaration:
+ * char *ci_attrs[NPARMS + 2];
+ */
+ if (attr >= ci->ci_attrs + sizeof ci->ci_attrs/sizeof (char *) - 2) {
+ advise (NULL,
+ "too many parameters in message %s's %s: field (%d max)",
+ filename, TYPE_FIELD, NPARMS);
+ *status = NOTOK;
+ return NOTOK;
+ }
+
+ cp++;
+ while (isspace ((unsigned char) *cp))
+ cp++;
+
+ if (*cp == '(' &&
+ get_comment (filename, ci, &cp, 1) == NOTOK) {
+ *status = NOTOK;
+ return NOTOK;
+ }
+
+ if (*cp == 0) {
+ advise (NULL,
+ "extraneous trailing ';' in message %s's %s: "
+ "parameter list",
+ filename, TYPE_FIELD);
+ *status = OK;
+ return NOTOK;
+ }
+
+ /* 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);
+
+ 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, TYPE_FIELD, len, len, "", cp, dp - cp);
+ *status = NOTOK;
+ return NOTOK;
+ }
+
+ vp = (*attr = add (cp, NULL)) + (up - cp);
+ *vp = '\0';
+ for (dp++; isspace ((unsigned char) *dp);)
+ dp++;
+
+ /* Now store the attribute value. */
+ ci->ci_values[attr - ci->ci_attrs] = vp = *attr + (dp - cp);
+
+ if (*dp == '"') {
+ for (cp = ++dp, dp = vp;;) {
+ switch (c = *cp++) {
+ case '\0':
+bad_quote:
+ advise (NULL,
+ "invalid quoted-string in message %s's %s: "
+ "field\n%*.*s(parameter %s)",
+ filename, TYPE_FIELD, len, len, "", *attr);
+ *status = NOTOK;
+ return NOTOK;
+
+ case '\\':
+ *dp++ = c;
+ if ((c = *cp++) == '\0')
+ goto bad_quote;
+ /* else fall... */
+
+ default:
+ *dp++ = c;
+ continue;
+
+ case '"':
+ *dp = '\0';
+ break;
+ }
+ break;
+ }
+ } else {
+ for (cp = dp, dp = vp; istoken (*cp); cp++, dp++)
+ continue;
+ *dp = '\0';
+ }
+ if (!*vp) {
+ advise (NULL,
+ "invalid parameter in message %s's %s: "
+ "field\n%*.*s(parameter %s)",
+ filename, TYPE_FIELD, len, len, "", *attr);
+ *status = NOTOK;
+ return NOTOK;
+ }
+
+ while (isspace ((unsigned char) *cp))
+ cp++;
+
+ if (*cp == '(' &&
+ get_comment (filename, ci, &cp, 1) == NOTOK) {
+ *status = NOTOK;
+ return NOTOK;
+ }
+
+ ++attr;
+ }
+
+ *header_attrp = cp;
+ return OK;
+}
+
+/*
+ * Create a string based on a list of output parameters. Assume that this
+ * parameter string will be appended to an existing header, so start out
+ * with the separator (;). Perform RFC 2231 encoding when necessary.
+ */
+
+char *
+output_params(size_t initialwidth, PM params)
+{
+ char *paramout = NULL;
+ char line[CPERLIN + 1], *q;
+ int curlen, index, eightbit;
+ size_t valoff;
+
+ while (params != NULL) {
+ index = 0;
+ valoff = 0;
+ q = line;
+
+ curlen = param_len(params, index, valoff, &eightbit);
+
+ /*
+ * If this won't fit on the line, start a new one. Save room in
+ * case we need a semicolon on the end
+ */
+
+ if (initialwidth + curlen > CPERLIN - 1) {
+ paramout = add(";\n\t", paramout);
+ initialwidth = 8;
+ }
+
+ /*
+ * Loop until we get a parameter that fits within a line.
+ */
+
+ while (initialwidth + curlen > CPERLIN - 1) {
+ int curvallen = strlen(params->pm_value + valoff) -
+ (initialwidth + curlen - (CPERLIN - 1));
+
+ /*
+ * curvallen holds how many characters we take from this
+ * current value. Make sure it's at least 1.
+ */
+
+ if (curvallen < 1)
+ curvallen = 1;
+ }
+ params = params->pm_next;
+ }
+
+ return paramout;
+}
+
+/*
+ * Calculate the size of a parameter. Include any necessary encoding.
+ * Start the length computation from where "offset" is marked.
+ */
+
+static size_t
+param_len(PM pm, int index, size_t valueoff, int *eightbit)
+{
+ char *start = pm->pm_value + valueoff, *p;
+ size_t len = 0;
+
+ *eightbit = 0;
+
+ /*
+ * Add up the length. First, start with the parameter name, and include
+ * the equal sign.
+ */
+
+ len += strlen(pm->pm_name) + 1;
+
+ /*
+ * Scan the parameter value. If we find an 8-bit character, then
+ * we need to compute the locale name for the length.
+ */
+
+ for (p = start; *p != '\0'; p++) {
+ if (! isascii((unsigned char) *p)) {
+ *eightbit = 1;
+ break;
+ }
+ }
+
+ /*
+ * If we've got 8-bit character, put the locale on the front (if we're
+ * doing part 0. Also compute the length of the string based on the
+ * encoding we need to do.
+ */
+
+ if (*eightbit) {
+ len++; /* For the encoding we need to do */
+ if (index == 0) {
+ len += strlen(write_charset_8bit()) + 2; /* Plus extra '' */
+ } else {
+ /*
+ * We know we definitely need to include an index.
+ * This will get the length wrong if we have more than 99
+ * sections. I can live with that.
+ */
+ len += 2; /* *<N> */
+ if (index > 9)
+ len++;
+ }
+ for (p = start; *p != '\0'; p++) {
+ if (isparamencode(*p))
+ len += 3;
+ else
+ len++;
+ }
+ } else {
+ /*
+ * Much simpler! Don't forget opening and closing quotes.
+ */
+ len += strlen(start) + 2;
+ }
+
+ return len;
+}