}
}
-static parameter_t *parse_parameters(const char *s)
+static parameters_t *parse_parameters(const char *s)
{
- parameter_t *res = NULL;
- parameter_t **list = &res;
+ parameters_t *res = parameter_new();
while (*s) {
+ char *attr, *val;
const char *p;
- parameter_t *new;
int i;
s = skipspaces(s);
}
i = p - s;
- new = parameter_new();
- new->attribute = p_dupstr(s, i);
+ attr = p_dupstr(s, i);
- while (--i >= 0 && ISSPACE(new->attribute[i])) {
- new->attribute[i] = '\0';
+ while (--i >= 0 && ISSPACE(attr[i])) {
+ attr[i] = '\0';
}
s = skipspaces(p + 1); /* skip over the = */
}
}
- new->value = p_dupstr(buffer, i);
+ val = p_dupstr(buffer, i);
} else {
for (p = s; *p && *p != ' ' && *p != ';'; p++);
- new->value = p_dupstr(s, p - s);
+ val = p_dupstr(s, p - s);
}
- *list = new;
- list = &new->next;
-
+ parameter_setval(res, attr, val);
+ p_delete(&attr);
+ p_delete(&val);
s = strchr(s, ';'); /* Find the next parameter */
if (!s)
break; /* no more parameters */
}
- rfc2231_decode_parameters(&res);
+ rfc2231_decode_parameters(res);
return res;
}
char *subtype;
p_delete(&ct->subtype);
- parameter_list_wipe(&ct->parameter);
+ ct->parameter = NULL;
/* First extract any existing parameters */
if ((pc = strchr(s, ';')) != NULL) {
if (ct->type == TYPETEXT) {
pc = parameter_getval(ct->parameter, "charset");
if (!pc) {
- parameter_setval(&ct->parameter, "charset",
+ parameter_setval(ct->parameter, "charset",
charset_getfirst(mod_cset.assumed_charset));
}
}
/* Check to see if a default filename was given */
if ((s = strchr (s, ';'))) {
- parameter_t *parms = parse_parameters(vskipspaces(s));
+ parameters_t *parms = parse_parameters(vskipspaces(s));
if ((s = parameter_getval(parms, "filename")))
m_strreplace(&ct->filename, s);
if ((s = parameter_getval(parms, "name")))
ct->form_name = m_strdup(s);
-
- parameter_list_wipe(&parms);
}
}