if (ct->c_dispo_type &&
!get_param(ct->c_dispo_first, "filename", '_', 1)) {
add_param(&ct->c_dispo_first, &ct->c_dispo_last, "filename",
- r1bindex(ci->ci_magic, '/'));
+ r1bindex(ci->ci_magic, '/'), 0);
}
}
else
struct sectlist {
char *value;
int index;
+ int len;
struct sectlist *next;
} *sp, *sp2;
struct parmlist {
char *lang;
struct sectlist *sechead;
struct parmlist *next;
- } *pp, *phead = NULL;
+ } *pp, *pp2, *phead = NULL;
while (*cp == ';') {
char *dp, *vp, *up, *nameptr, *valptr, *charset = NULL, *lang = NULL;
- int encoded = 0, partial = 0, index = 0, len = 0;
+ int encoded = 0, partial = 0, len = 0, index = 0;
cp++;
while (isspace ((unsigned char) *cp))
*/
if (index == 0) {
vp = dp;
- while (*vp != '\'' && !isspace((unsigned char) *vp))
+ while (*vp != '\'' && !isspace((unsigned char) *vp) &&
+ *vp != '\0')
vp++;
if (*vp == '\'') {
if (vp != dp) {
} else {
charset = NULL;
}
+ vp++;
} else {
advise(NULL, "missing charset in message %s's %s: "
"field\n%*s(parameter %s)", filename, fieldname,
free(nameptr);
return NOTOK;
}
- }
+ dp = vp;
- vp = (dp = vp);
- while (*vp != '\'' && !isspace((unsigned char) *vp))
- vp++;
+ while (*vp != '\'' && !isspace((unsigned char) *vp) &&
+ *vp != '\0')
+ vp++;
- if (*vp == '\'') {
- if (vp != dp) {
- len = vp - dp;
- lang = mh_xmalloc(len + 1);
- strncpy(lang, dp, len);
- lang[len] = '\0';
+ if (*vp == '\'') {
+ if (vp != dp) {
+ len = vp - dp;
+ lang = mh_xmalloc(len + 1);
+ strncpy(lang, dp, len);
+ lang[len] = '\0';
+ } else {
+ lang = NULL;
+ }
+ vp++;
} else {
- charset = NULL;
+ advise(NULL, "missing language tag in message %s's %s: "
+ "field\n%*s(parameter %s)", filename, fieldname,
+ strlen(invo_name) + 2, "", nameptr);
+ free(nameptr);
+ if (charset)
+ free(charset);
+ return NOTOK;
}
- } else {
- advise(NULL, "missing language tag in message %s's %s: "
- "field\n%*s(parameter %s)", filename, fieldname,
- strlen(invo_name) + 2, "", nameptr);
- free(nameptr);
- if (charset)
- free(charset);
- return NOTOK;
+
+ dp = vp;
}
/*
* length so we can allocate the correct buffer size.
*/
- for (dp = vp, len = 0; *vp != '\0' && !isspace((unsigned char) *vp);
- vp++) {
+ for (vp = dp, len = 0; istoken(*vp); vp++) {
if (*vp == '%') {
if (*(vp + 1) == '\0' ||
!isxdigit((unsigned char) *(vp + 1)) ||
up = valptr = mh_xmalloc(len + 1);
- for (vp = dp; *vp != '\0' && !isspace((unsigned char) *vp); vp++) {
+ for (vp = dp; istoken(*vp); vp++) {
if (*vp == '%') {
*up++ = decode_qp(*(vp + 1), *(vp + 2));
vp += 2;
}
*up = '\0';
+ cp = vp;
} else {
/*
* A "normal" string. If it's got a leading quote, then we
memset(sp, 0, sizeof(*sp));
sp->value = valptr;
sp->index = index;
+ sp->len = len;
if (pp->sechead == NULL || pp->sechead->index > index) {
sp->next = pp->sechead;
return NOTOK;
}
if (sp2->index < sp->index &&
- (sp2->next == NULL || sp2->next->index < sp->index)) {
+ (sp2->next == NULL || sp2->next->index > sp->index)) {
sp->next = sp2->next;
sp2->next = sp;
break;
if (sp2 == NULL) {
advise(NULL, "Internal error: cannot insert partial "
- "param in message %s's %s: field\n*s(parameter %s)",
+ "param in message %s's %s: field\n%*s(parameter %s)",
filename, fieldname, strlen(invo_name) + 2, "",
nameptr);
return NOTOK;
pp->lang = lang;
}
} else {
- pm = add_param(param_head, param_tail, nameptr, valptr);
- free(nameptr);
- free(valptr);
+ pm = add_param(param_head, param_tail, nameptr, valptr, 1);
pm->pm_charset = charset;
pm->pm_lang = lang;
}
}
}
+ /*
+ * Now that we're done, reassemble all of the partial parameters.
+ */
+
+ for (pp = phead; pp != NULL; ) {
+ char *p, *q;
+ size_t tlen = 0;
+ int pindex = 0;
+ for (sp = pp->sechead; sp != NULL; sp = sp->next) {
+ if (sp->index != pindex++) {
+ advise(NULL, "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);
+ return NOTOK;
+ }
+ tlen += sp->len;
+ }
+
+ p = q = mh_xmalloc(tlen + 1);
+ for (sp = pp->sechead; sp != NULL; ) {
+ memcpy(q, sp->value, sp->len);
+ q += sp->len;
+ free(sp->value);
+ sp2 = sp->next;
+ free(sp);
+ sp = sp2;
+ }
+
+ p[tlen] = '\0';
+
+ pm = add_param(param_head, param_tail, pp->name, p, 1);
+ pm->pm_charset = pp->charset;
+ pm->pm_lang = pp->lang;
+ pp2 = pp->next;
+ free(pp);
+ pp = pp2;
+ }
+
*header_attrp = cp;
return OK;
}
*/
PM
-add_param(PM *first, PM *last, const char *name, const char *value)
+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_name = getcpy(name);
- pm->pm_value = getcpy(value);
+ pm->pm_name = nocopy ? name : getcpy(name);
+ pm->pm_value = nocopy ? value : getcpy(value);
if (*first) {
(*last)->pm_next = pm;