X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/337b4e616e8f53ba06285b1645e1df9918ed5c16..a7ec5d546fe5dbf8bc375bdb8d69f5f84789fc7e:/uip/mhbuildsbr.c?ds=sidebyside

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 68c555d3..e046886f 100644
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -145,7 +145,7 @@ build_mime (char *infile, int autobuild, int dist, int directives,
     /*
      * Allocate space for primary (outside) content
      */
-    if ((ct = (CT) calloc (1, sizeof(*ct))) == NULL)
+    if ((ct = (CT) mh_xcalloc (1, sizeof(*ct))) == NULL)
 	adios (NULL, "out of memory");
 
     /*
@@ -205,7 +205,8 @@ build_mime (char *infile, int autobuild, int dist, int directives,
 	     * header; in that case, add it to our attach list
 	     */
 
-	    if (strcasecmp(ATTACH_FIELD, np) == 0) {
+	    if (strcasecmp(ATTACH_FIELD, np) == 0  ||
+		strcasecmp(ATTACH_FIELD_ALT, np) == 0) {
 		struct attach_list *entry;
 		char *s = vp, *e = vp + strlen(vp) - 1;
 		free(np);
@@ -295,7 +296,7 @@ finish_field:
     ct->c_type = CT_MULTIPART;
     ct->c_subtype = MULTI_MIXED;
 
-    if ((m = (struct multipart *) calloc (1, sizeof(*m))) == NULL)
+    if ((m = (struct multipart *) mh_xcalloc (1, sizeof(*m))) == NULL)
 	adios (NULL, "out of memory");
     ct->c_ctparams = (void *) m;
     pp = &m->mp_parts;
@@ -315,7 +316,7 @@ finish_field:
 	if (!p)
 	    continue;
 
-	if ((part = (struct part *) calloc (1, sizeof(*part))) == NULL)
+	if ((part = (struct part *) mh_xcalloc (1, sizeof(*part))) == NULL)
 	    adios (NULL, "out of memory");
 	*pp = part;
 	pp = &part->mp_next;
@@ -336,7 +337,7 @@ finish_field:
 	    adios("reading", "Unable to open %s for", at_entry->filename);
 	}
 
-	if ((p = (CT) calloc (1, sizeof(*p))) == NULL)
+	if ((p = (CT) mh_xcalloc (1, sizeof(*p))) == NULL)
 	    adios(NULL, "out of memory");
 
 	init_decoded_content(p, infile);
@@ -349,7 +350,7 @@ finish_field:
 
 	setup_attach_content(p, at_entry->filename);
 
-	if ((part = (struct part *) calloc (1, sizeof(*part))) == NULL)
+	if ((part = (struct part *) mh_xcalloc (1, sizeof(*part))) == NULL)
 	    adios (NULL, "out of memory");
 	*pp = part;
 	pp = &part->mp_next;
@@ -370,7 +371,7 @@ finish_field:
 	struct part *part;
 	struct text *t;
 
-	if ((p = (CT) calloc (1, sizeof(*p))) == NULL)
+	if ((p = (CT) mh_xcalloc (1, sizeof(*p))) == NULL)
 	    adios(NULL, "out of memory");
 
 	init_decoded_content(p, infile);
@@ -390,13 +391,13 @@ finish_field:
 	p->c_begin = ftell(in);
 	p->c_end = ftell(in);
 
-	if ((t = (struct text *) calloc (1, sizeof (*t))) == NULL)
+	if ((t = (struct text *) mh_xcalloc (1, sizeof (*t))) == NULL)
 	    adios (NULL, "out of memory");
 
 	t->tx_charset = CHARSET_SPECIFIED;
 	p->c_ctparams = t;
 
-	if ((part = (struct part *) calloc (1, sizeof(*part))) == NULL)
+	if ((part = (struct part *) mh_xcalloc (1, sizeof(*part))) == NULL)
 	    adios (NULL, "out of memory");
 	*pp = part;
 	part->mp_part = p;
@@ -544,7 +545,7 @@ user_content (FILE *in, char *buf, CT *ctp, const char *infilename)
     }
 
     /* allocate basic Content structure */
-    if ((ct = (CT) calloc (1, sizeof(*ct))) == NULL)
+    if ((ct = (CT) mh_xcalloc (1, sizeof(*ct))) == NULL)
 	adios (NULL, "out of memory");
     *ctp = ct;
 
@@ -776,7 +777,7 @@ use_forw:
 	     * reference, we need to create another Content structure
 	     * for the message/external-body to wrap it in.
 	     */
-	    if ((ct = (CT) calloc (1, sizeof(*ct))) == NULL)
+	    if ((ct = (CT) mh_xcalloc (1, sizeof(*ct))) == NULL)
 		adios (NULL, "out of memory");
 	    init_decoded_content(ct, infilename);
 	    *ctp = ct;
@@ -785,7 +786,7 @@ use_forw:
 	    ct->c_type = CT_MESSAGE;
 	    ct->c_subtype = MESSAGE_EXTERNAL;
 
-	    if ((e = (struct exbody *) calloc (1, sizeof(*e))) == NULL)
+	    if ((e = (struct exbody *) mh_xcalloc (1, sizeof(*e))) == NULL)
 		adios (NULL, "out of memory");
 	    ct->c_ctparams = (void *) e;
 
@@ -895,7 +896,7 @@ use_forw:
 	    ct->c_type = CT_MULTIPART;
 	    ct->c_subtype = MULTI_DIGEST;
 
-	    if ((m = (struct multipart *) calloc (1, sizeof(*m))) == NULL)
+	    if ((m = (struct multipart *) mh_xcalloc (1, sizeof(*m))) == NULL)
 		adios (NULL, "out of memory");
 	    ct->c_ctparams = (void *) m;
 	    pp = &m->mp_parts;
@@ -906,7 +907,7 @@ use_forw:
 		    CT p;
 		    CE pe;
 
-		    if ((p = (CT) calloc (1, sizeof(*p))) == NULL)
+		    if ((p = (CT) mh_xcalloc (1, sizeof(*p))) == NULL)
 			adios (NULL, "out of memory");
 		    init_decoded_content (p, infilename);
 		    pe = &p->c_cefile;
@@ -920,7 +921,7 @@ use_forw:
 		    if (listsw && stat (pe->ce_file, &st) != NOTOK)
 			p->c_end = (long) st.st_size;
 
-		    if ((part = (struct part *) calloc (1, sizeof(*part))) == NULL)
+		    if ((part = (struct part *) mh_xcalloc (1, sizeof(*part))) == NULL)
 			adios (NULL, "out of memory");
 		    *pp = part;
 		    pp = &part->mp_next;
@@ -981,7 +982,7 @@ use_forw:
 	ct->c_type = CT_MULTIPART;
 	ct->c_subtype = vrsn;
 
-	if ((m = (struct multipart *) calloc (1, sizeof(*m))) == NULL)
+	if ((m = (struct multipart *) mh_xcalloc (1, sizeof(*m))) == NULL)
 	    adios (NULL, "out of memory");
 	ct->c_ctparams = (void *) m;
 
@@ -998,7 +999,7 @@ use_forw:
 	    if (!p)
 		continue;
 
-	    if ((part = (struct part *) calloc (1, sizeof(*part))) == NULL)
+	    if ((part = (struct part *) mh_xcalloc (1, sizeof(*part))) == NULL)
 		adios (NULL, "out of memory");
 	    *pp = part;
 	    pp = &part->mp_next;