X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhbuild.c;h=4ff06efde4794652a7cd32e29807f4432c69b6b4;hp=140cfdb39dc669f5704e28559ef7cd8d9138570d;hb=d4c34b4439a9dbd89664de460ed37ecddc260fb1;hpb=e16d5bfc58d8b0dfe61701cd4d6b1732e837d60a

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 140cfdb..4ff06ef 100644
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -319,6 +319,7 @@ build_mime(char *infile)
 	struct part **pp;
 	CT ct;
 	FILE *in;
+	HF hp;
 
 	umask(~m_gmprot());
 
@@ -329,8 +330,7 @@ build_mime(char *infile)
 	/*
 	** Allocate space for primary (outside) content
 	*/
-	if ((ct = (CT) mh_xcalloc(1, sizeof(*ct))) == NULL)
-		adios(EX_OSERR, NULL, "out of memory");
+	ct = mh_xcalloc(1, sizeof(*ct));
 
 	/*
 	** Allocate structure for handling decoded content
@@ -348,7 +348,6 @@ build_mime(char *infile)
 		switch (state = m_getfld(state, name, buf, sizeof(buf), in)) {
 		case FLD:
 		case FLDPLUS:
-		case FLDEOF:
 			compnum++;
 
 			/* abort if draft has Mime-Version header field */
@@ -367,7 +366,7 @@ build_mime(char *infile)
 				while (state == FLDPLUS)
 					state = m_getfld(state, name, buf,
 							sizeof(buf), in);
-				goto finish_field;
+				continue;
 			}
 
 			/* get copies of the buffers */
@@ -384,18 +383,13 @@ build_mime(char *infile)
 			/* Now add the header data to the list */
 			add_header(ct, np, vp);
 
-finish_field:
-			/* if this wasn't the last hdr field, then continue */
-			if (state != FLDEOF)
-				continue;
-			/* else fall... */
+			continue;
 
 		case FILEEOF:
 			adios(EX_CONFIG, NULL, "draft has empty body -- no directives!");
 			/* NOTREACHED */
 
 		case BODY:
-		case BODYEOF:
 			fseek(in, (long) (-strlen(buf)), SEEK_CUR);
 			break;
 
@@ -411,6 +405,16 @@ finish_field:
 	}
 
 	/*
+	** Iterate through the list of headers and call the function to
+	** MIME-ify them if required.
+	*/
+	for (hp = ct->c_first_hf; hp != NULL; hp = hp->next) {
+		if (encode_rfc2047(hp->name, &hp->value, NULL)) {
+			adios(EX_DATAERR, NULL, "Unable to encode header \"%s\"", hp->name);
+		}
+	}
+
+	/*
 	** Now add the MIME-Version header field
 	** to the list of header fields.
 	*/
@@ -430,8 +434,7 @@ finish_field:
 	ct->c_subtype = MULTI_MIXED;
 	ct->c_file = getcpy(infile);
 
-	if ((m = (struct multipart *) mh_xcalloc(1, sizeof(*m))) == NULL)
-		adios(EX_OSERR, NULL, "out of memory");
+	m = mh_xcalloc(1, sizeof(*m));
 	ct->c_ctparams = (void *) m;
 	pp = &m->mp_parts;
 
@@ -450,8 +453,7 @@ finish_field:
 		if (!p)
 			continue;
 
-		if ((part = (struct part *) mh_xcalloc(1, sizeof(*part))) == NULL)
-			adios(EX_OSERR, NULL, "out of memory");
+		part = mh_xcalloc(1, sizeof(*part));
 		*pp = part;
 		pp = &part->mp_next;
 		part->mp_part = p;
@@ -531,8 +533,7 @@ init_decoded_content(CT ct)
 {
 	CE ce;
 
-	if ((ce = (CE) mh_xcalloc(1, sizeof(*ce))) == NULL)
-		adios(EX_OSERR, NULL, "out of memory");
+	ce = mh_xcalloc(1, sizeof(*ce));
 
 	ct->c_cefile     = ce;
 	ct->c_ceopenfnx  = open7Bit;  /* since unencoded */
@@ -592,8 +593,7 @@ user_content(FILE *in, char *file, char *buf, CT *ctp)
 	}
 
 	/* allocate basic Content structure */
-	if ((ct = (CT) mh_xcalloc(1, sizeof(*ct))) == NULL)
-		adios(EX_OSERR, NULL, "out of memory");
+	ct = mh_xcalloc(1, sizeof(*ct));
 	*ctp = ct;
 
 	/* allocate basic structure for handling decoded content */
@@ -807,7 +807,7 @@ use_forw:
 				if (!*cp)
 					adios(EX_DATAERR, NULL, "empty pipe command for #%s directive", ci->ci_type);
 				cp = getcpy(cp);
-				free(ci->ci_magic);
+				mh_free0(&(ci->ci_magic));
 				ci->ci_magic = cp;
 			} else {
 				/* record filename of decoded contents */
@@ -885,7 +885,7 @@ use_forw:
 				if (!m_convert(mp, cp))
 					exit(EX_USAGE);
 		}
-		free(folder);
+		mh_free0(&folder);
 		free_ctinfo(ct);
 
 		/*
@@ -901,9 +901,7 @@ use_forw:
 			ct->c_type = CT_MULTIPART;
 			ct->c_subtype = MULTI_DIGEST;
 
-			if ((m = (struct multipart *)
-					mh_xcalloc(1, sizeof(*m))) == NULL)
-				adios(EX_OSERR, NULL, "out of memory");
+			m = mh_xcalloc(1, sizeof(*m));
 			ct->c_ctparams = (void *) m;
 			pp = &m->mp_parts;
 
@@ -913,9 +911,7 @@ use_forw:
 					CT p;
 					CE pe;
 
-					if ((p = (CT) mh_xcalloc(1, sizeof(*p)))
-							== NULL)
-						adios(EX_OSERR, NULL, "out of memory");
+					p = mh_xcalloc(1, sizeof(*p));
 					init_decoded_content(p);
 					pe = p->c_cefile;
 					if (get_ctinfo("message/rfc822", p, 0)
@@ -929,8 +925,7 @@ use_forw:
 							msgnum);
 					pe->ce_file = getcpy(buffer);
 
-					if ((part = (struct part *) mh_xcalloc(1, sizeof(*part))) == NULL)
-						adios(EX_OSERR, NULL, "out of memory");
+					part = mh_xcalloc(1, sizeof(*part));
 					*pp = part;
 					pp = &part->mp_next;
 					part->mp_part = p;
@@ -989,8 +984,7 @@ use_forw:
 		ct->c_type = CT_MULTIPART;
 		ct->c_subtype = vrsn;
 
-		if ((m = (struct multipart *) mh_xcalloc(1, sizeof(*m))) == NULL)
-			adios(EX_OSERR, NULL, "out of memory");
+		m = mh_xcalloc(1, sizeof(*m));
 		ct->c_ctparams = (void *) m;
 
 		pp = &m->mp_parts;
@@ -1006,9 +1000,7 @@ use_forw:
 			if (!p)
 				continue;
 
-			if ((part = (struct part *)
-					mh_xcalloc(1, sizeof(*part))) == NULL)
-				adios(EX_OSERR, NULL, "out of memory");
+			part = mh_xcalloc(1, sizeof(*part));
 			*pp = part;
 			pp = &part->mp_next;
 			part->mp_part = p;
@@ -1529,6 +1521,9 @@ build_headers(CT ct)
 	if (ct->c_descr) {
 		np = getcpy(DESCR_FIELD);
 		vp = concat(" ", ct->c_descr, NULL);
+		if (encode_rfc2047(DESCR_FIELD, &vp, NULL)) {
+			adios(EX_DATAERR, NULL, "Unable to encode %s header", DESCR_FIELD);
+		}
 		add_header(ct, np, vp);
 	}