X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a5aa6164d9e9c178c800187fa606f83c1bac916f..236a2b64249d7ffe0c4eaea2ef89b86f759ceda6:/uip/mhoutsbr.c

diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c
index cb530e1e..8f19702c 100644
--- a/uip/mhoutsbr.c
+++ b/uip/mhoutsbr.c
@@ -83,9 +83,8 @@ output_content (CT ct, FILE *out)
     CI ci = &ct->c_ctinfo;
     char *boundary = "", *cp;
 
-    if ((cp = get_param(ci->ci_first_pm, "boundary, '-', 0)))
+    if ((cp = get_param(ci->ci_first_pm, "boundary", '-', 0)))
 	boundary = cp;
-    }
 
     /*
      * Output all header fields for this content
@@ -232,7 +231,7 @@ output_headers (CT ct, FILE *out)
 static int
 writeExternalBody (CT ct, FILE *out)
 {
-    char *cp;
+    char *cp, *dp;
     struct exbody *e = (struct exbody *) ct->c_ctparams;
 		
     putc ('\n', out);
@@ -244,7 +243,7 @@ writeExternalBody (CT ct, FILE *out)
 	    switch (*++cp) {
 	    case 'I':
 		if (ct2->c_id) {
-		    char *dp = trimcpy (ct2->c_id);
+		    dp = trimcpy (ct2->c_id);
 
 		    fputs (dp, out);
 		    free (dp);
@@ -252,17 +251,22 @@ writeExternalBody (CT ct, FILE *out)
 		continue;
 
 	    case 'N':
-		for (pm = ci2->ci_first_pm; pm; pm = pm->pm_next)
-		    if (!strcasecmp (pm->pm_name, "name")) {
-			fprintf (out, "%s", pm->pm_value);
-			break;
-		    }
+		dp = get_param(ci2->ci_first_pm, "name", '_', 0);
+		if (dp) {
+		    fputs (dp, out);
+		    free (dp);
+		}
 		continue;
 
 	    case 'T':
 		fprintf (out, "%s/%s", ci2->ci_type, ci2->ci_subtype);
-		for (pm = ci2->ci_first_pm; pm; pm = pm->pm_next)
-		    fprintf (out, "; %s=\"%s\"", pm->pm_name, pm->pm_value);
+		dp = output_params(strlen(ci2->ci_type) +
+				   strlen(ci2->ci_subtype) + 1,
+				   ci2->ci_first_pm, NULL, 0);
+		if (dp) {
+		    fputs (dp, out);
+		    free (dp);
+		}
 		continue;
 
 	    case 'n':