X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/64de90c03d49e3484f0e00818f9d8559a1292065..d2520ac7054ad75d60342606bf13c821305d958c:/uip/mhparse.c

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 9cd38f99..59f8b221 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -838,7 +838,7 @@ magic_skip:
             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
@@ -3255,6 +3255,7 @@ parse_header_attrs (const char *filename, const char *fieldname,
     struct sectlist {
 	char *value;
 	int index;
+	int len;
 	struct sectlist *next;
     } *sp, *sp2;
     struct parmlist {
@@ -3263,11 +3264,11 @@ parse_header_attrs (const char *filename, const char *fieldname,
 	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))
@@ -3357,7 +3358,8 @@ parse_header_attrs (const char *filename, const char *fieldname,
 	     */
 	    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) {
@@ -3376,30 +3378,33 @@ parse_header_attrs (const char *filename, const char *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 {
-		    lang = 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;
 		}
-		vp++;
-	    } 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;
 	    }
 
 	    /*
@@ -3409,8 +3414,7 @@ parse_header_attrs (const char *filename, const char *fieldname,
 	     * 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)) ||
@@ -3434,7 +3438,7 @@ parse_header_attrs (const char *filename, const char *fieldname,
 
 	    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;
@@ -3542,6 +3546,7 @@ bad_quote:
 	    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;
@@ -3556,7 +3561,7 @@ bad_quote:
 			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;
@@ -3565,7 +3570,7 @@ bad_quote:
 
 		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;
@@ -3585,9 +3590,7 @@ bad_quote:
 		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;
 	}
@@ -3601,10 +3604,68 @@ bad_quote:
         }
     }
 
+    /*
+     * 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;
 }
 
+/*
+ * Return the charset for a particular content type.  Return pointer is
+ * only valid until the next call to content_charset().
+ */
+
+char *
+content_charset (CT ct) {
+    static char *ret_charset = NULL;
+
+    if (ret_charset != NULL) {
+	free(ret_charset);
+    }
+
+    ret_charset = get_param(ct->c_ctinfo.ci_first_pm, "charset", '?', 0);
+
+    return ret_charset ? ret_charset : "US-ASCII";
+}
+
+
 /*
  * 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
@@ -4012,14 +4073,14 @@ normal_param(PM pm, char *output, size_t len, size_t valuelen,
  */
 
 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;
@@ -4032,6 +4093,33 @@ add_param(PM *first, PM *last, const char *name, const char *value)
     return pm;
 }
 
+/*
+ * Either replace a current parameter with a new value, or add the parameter
+ * to the parameter linked list.
+ */
+
+PM
+replace_param(PM *first, PM *last, char *name, char *value, int nocopy)
+{
+    PM pm;
+
+    for (pm = *first; pm != NULL; pm = pm->pm_next) {
+	if (strcasecmp(name, pm->pm_name) == 0) {
+	    /*
+	     * If nocopy is set, it's assumed that we own both name
+	     * and value.  We don't need name, so we discard it now.
+	     */
+	    if (nocopy)
+		free(name);
+	    free(pm->pm_value);
+	    pm->pm_value = nocopy ? value : getcpy(value);
+	    return pm;
+	}
+    }
+
+    return add_param(first, last, name, value, nocopy);
+}
+
 /*
  * Retrieve a parameter value from a parameter linked list.  If the parameter
  * value needs converted to the local character set, do that now.
@@ -4067,7 +4155,10 @@ char *get_param_value(PM pm, char replace)
     int utf8;
     iconv_t cd;
     ICONV_CONST char *p;
+#else /* HAVE_ICONV */
+    char *p;
 #endif /* HAVE_ICONV */
+
     char *q;
 
     /*
@@ -4142,9 +4233,10 @@ char *get_param_value(PM pm, char replace)
     *q = '\0';
 
     return buffer;
-#endif /* HAVE_ICONV */
 
 noiconv:
+#endif /* HAVE_ICONV */
+
     /*
      * Take everything non-ASCII and substituite the replacement character
      */