extern int debugsw;
-extern int verbosw;
extern int listsw;
extern int rfc934sw;
extern int rcachesw; /* mhcachesbr.c */
extern int wcachesw; /* mhcachesbr.c */
-pid_t xpid = 0;
-
static char prefix[] = "----- =_aaaaaaaaaa";
struct attach_list {
static char *fgetstr (char *, int, FILE *);
static int user_content (FILE *, char *, CT *);
static void set_id (CT, int);
-static int compose_content (CT);
+static int compose_content (CT, int);
static int scan_content (CT, size_t);
-static int build_headers (CT);
+static int build_headers (CT, int);
static char *calculate_digest (CT, int);
CT
build_mime (char *infile, int autobuild, int dist, int directives,
- int header_encoding, size_t maxunencoded)
+ int header_encoding, size_t maxunencoded, int verbose)
{
int compnum, state;
char buf[BUFSIZ], name[NAMESZ];
* Fill out, or expand directives. Parse and execute
* commands specified by profile composition strings.
*/
- compose_content (ct);
+ compose_content (ct, verbose);
if ((cp = strchr(prefix, 'a')) == NULL)
adios (NULL, "internal error(4)");
/* Build the rest of the header field structures */
if (! dist)
- build_headers (ct);
+ build_headers (ct, header_encoding);
return ct;
}
*/
static int
-compose_content (CT ct)
+compose_content (CT ct, int verbose)
{
CE ce = &ct->c_cefile;
sprintf (pp, "%d", partnum);
p->c_partno = add (partnam, NULL);
- if (compose_content (p) == NOTOK)
+ if (compose_content (p, verbose) == NOTOK)
return NOTOK;
}
if (!ce->ce_file) {
pid_t child_id;
int i, xstdout, len, buflen;
- char *bp, **ap, *cp;
+ char *bp, *cp;
char *vec[4], buffer[BUFSIZ];
FILE *out;
CI ci = &ct->c_ctinfo;
for (pm = ci->ci_first_pm; pm; pm = pm->pm_next) {
snprintf (bp, buflen, "%s%s=\"%s\"", s,
- pm->pm_name, pm->pm_value);
+ pm->pm_name, get_param_value(pm, '?'));
len = strlen (bp);
bp += len;
buflen -= len;
}
}
- if (verbosw)
+ if (verbose)
printf ("composing content %s/%s from command\n\t%s\n",
ci->ci_type, ci->ci_subtype, buffer);
CI ci = &ct->c_ctinfo;
add_param(&ci->ci_first_pm, &ci->ci_last_pm, "charset",
- contains8bit ? write_charset_8bit() : "us-ascii");
+ contains8bit ? write_charset_8bit() : "us-ascii", 0);
t->tx_charset = CHARSET_SPECIFIED;
}
}
*/
static int
-build_headers (CT ct)
+build_headers (CT ct, int header_encoding)
{
int cc, mailbody, extbody, len;
char *np, *vp, buffer[BUFSIZ];
CI ci = &ct->c_ctinfo;
- PM pm;
/*
* If message is type multipart, then add the multipart
static int level = 0; /* store nesting level */
snprintf (buffer, sizeof(buffer), "%s%d", prefix, level++);
- add_param(&ci->ci_first_pm, &ci->ci_last_pm, "boundary", buffer);
+ add_param(&ci->ci_first_pm, &ci->ci_last_pm, "boundary", buffer, 0);
}
/*
* Append the attribute/value pairs to
* the end of the Content-Type line.
*/
- for (pm = ci->ci_first_pm; pm; pm = pm->pm_next) {
- if (mailbody && !strcasecmp (pm->pm_name, "body"))
- continue;
-
- vp = add (";", vp);
- len++;
-
- /*
- * According to RFC 2017, if we have a URL longer than 40 characters
- * we have to break it across multiple lines
- */
-
- if (extbody && strcasecmp (pm->pm_name, "url") == 0) {
- char *value = pm->pm_value;
-
- /* 7 here refers to " url=\"\"" */
- if (len + 1 + (cc = (min(MAXURLTOKEN, strlen(value)) + 7)) >=
- CPERLIN) {
- vp = add ("\n\t", vp);
- len = 8;
- } else {
- vp = add (" ", vp);
- len++;
- }
-
- vp = add ("url=\"", vp);
- len += 5;
- while (strlen(value) > MAXURLTOKEN) {
- strncpy(buffer, value, MAXURLTOKEN);
- buffer[MAXURLTOKEN] = '\0';
- vp = add (buffer, vp);
- vp = add ("\n\t", vp);
- value += MAXURLTOKEN;
- len = 8;
- }
+ if (ci->ci_first_pm) {
+ char *s = output_params(len, ci->ci_first_pm, &len, mailbody);
- vp = add (value, vp);
- vp = add ("\"", vp);
- len += strlen(value) + 1;
- continue;
- }
+ if (!s)
+ adios(NULL, "Internal error: failed outputting Content-Type "
+ "parameters");
- snprintf (buffer, sizeof(buffer), "%s=\"%s\"", pm->pm_name, pm->pm_value);
- if (len + 1 + (cc = strlen (buffer)) >= CPERLIN) {
- vp = add ("\n\t", vp);
- len = 8;
- } else {
- vp = add (" ", vp);
- len++;
- }
- vp = add (buffer, vp);
- len += cc;
+ vp = add (s, vp);
+ free(s);
}
/*
vp = concat (" ", ct->c_id, NULL);
add_header (ct, np, vp);
}
-
/*
* output the Content-Description
*/
if (ct->c_descr) {
np = add (DESCR_FIELD, NULL);
vp = concat (" ", ct->c_descr, NULL);
+ if (encode_rfc2047(DESCR_FIELD, &vp, header_encoding, NULL))
+ adios(NULL, "Unable to encode %s header", DESCR_FIELD);
add_header (ct, np, vp);
}
/*
- * output the Content-Disposition
+ * output the Content-Disposition. If it's NULL but c_dispo_type is
+ * set, then we need to build it.
*/
if (ct->c_dispo) {
np = add (DISPO_FIELD, NULL);
vp = concat (" ", ct->c_dispo, NULL);
add_header (ct, np, vp);
+ } else if (ct->c_dispo_type) {
+ vp = concat (" ", ct->c_dispo_type, NULL);
+ len = strlen(DISPO_FIELD) + strlen(vp) + 1;
+ np = output_params(len, ct->c_dispo_first, NULL, 0);
+ vp = add(np, vp);
+ vp = add("\n", vp);
+ if (np)
+ free(np);
+ add_header (ct, getcpy(DISPO_FIELD), vp);
}
skip_headers:
CT p;
p = part->mp_part;
- build_headers (p);
+ build_headers (p, header_encoding);
}
}
break;
struct exbody *e;
e = (struct exbody *) ct->c_ctparams;
- build_headers (e->eb_content);
+ build_headers (e->eb_content, header_encoding);
}
break;
if (pm == NULL)
add_param(&ct->c_ctinfo.ci_first_pm, &ct->c_ctinfo.ci_last_pm,
- "name", simplename);
+ "name", simplename, 0);
ct->c_descr = getcpy(simplename);
ct->c_descr = add("\n", ct->c_descr);
if (strcasecmp(ct->c_ctinfo.ci_type, "text") == 0 &&
strcasecmp(ct->c_ctinfo.ci_subtype, "calendar") == 0) {
- ct->c_dispo = getcpy("inline; filename=\"");
+ ct->c_dispo_type = getcpy("inline");
} else {
- ct->c_dispo = getcpy("attachment; filename=\"");
+ ct->c_dispo_type = getcpy("attachment");
}
- ct->c_dispo = add(simplename, ct->c_dispo);
- ct->c_dispo = add("\"\n", ct->c_dispo);
+ add_param(&ct->c_dispo_first, &ct->c_dispo_last, "filename", simplename, 0);
}
projects / nmh / blobdiff