X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhstoresbr.c;h=aa95dd8ad7f6a0287cdb5f90b32a9c5cf4d0ece2;hp=e5b92e869a021a44cc96ef6ef960c7d396234612;hb=27826f9353e0f0b04590b7d0f8f83e60462b90f0;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index e5b92e8..aa95dd8 100644
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -13,7 +13,6 @@
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.h>
-#include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
@@ -46,36 +45,36 @@ typedef int (*qsort_comp) (const void *, const void *);
 
 
 /* mhmisc.c */
-int part_ok (CT, int);
-int type_ok (CT, int);
-int make_intermediates (char *);
-void flush_errors (void);
+int part_ok(CT, int);
+int type_ok(CT, int);
+int make_intermediates(char *);
+void flush_errors(void);
 
 /* mhshowsbr.c */
-int show_content_aux (CT, int, int, char *, char *);
+int show_content_aux(CT, int, int, char *, char *);
 
 /*
 ** prototypes
 */
-void store_all_messages (CT *);
+void store_all_messages(CT *);
 
 /*
 ** static prototypes
 */
-static void store_single_message (CT);
-static int store_switch (CT);
-static int store_generic (CT);
-static int store_application (CT);
-static int store_multi (CT);
-static int store_partial (CT);
-static int store_external (CT);
-static int ct_compar (CT *, CT *);
-static int store_content (CT, CT);
-static int output_content_file (CT, int);
-static int output_content_folder (char *, char *);
-static int parse_format_string (CT, char *, char *, int, char *);
-static void get_storeproc (CT);
-static int copy_some_headers (FILE *, CT);
+static void store_single_message(CT);
+static int store_switch(CT);
+static int store_generic(CT);
+static int store_application(CT);
+static int store_multi(CT);
+static int store_partial(CT);
+static int store_external(CT);
+static int ct_compar(CT *, CT *);
+static int store_content(CT, CT);
+static int output_content_file(CT, int);
+static int output_content_folder(char *, char *);
+static int parse_format_string(CT, char *, char *, int, char *);
+static void get_storeproc(CT);
+static int copy_some_headers(FILE *, CT);
 
 
 /*
@@ -84,7 +83,7 @@ static int copy_some_headers (FILE *, CT);
 */
 
 void
-store_all_messages (CT *cts)
+store_all_messages(CT *cts)
 {
 	CT ct, *ctp;
 	char *cp;
@@ -94,18 +93,18 @@ store_all_messages (CT *cts)
 	** store any contents.
 	*/
 	if (autosw)
-		dir = getcpy (cwd);
-	else if ((cp = context_find (nmhstorage)) && *cp)
-		dir = getcpy (cp);
+		dir = getcpy(cwd);
+	else if ((cp = context_find(nmhstorage)) && *cp)
+		dir = getcpy(cp);
 	else
-		dir = getcpy (cwd);
+		dir = getcpy(cwd);
 
 	for (ctp = cts; *ctp; ctp++) {
 		ct = *ctp;
-		store_single_message (ct);
+		store_single_message(ct);
 	}
 
-	flush_errors ();
+	flush_errors();
 }
 
 
@@ -115,13 +114,13 @@ store_all_messages (CT *cts)
 */
 
 static void
-store_single_message (CT ct)
+store_single_message(CT ct)
 {
-	if (type_ok (ct, 1)) {
-		umask (ct->c_umask);
-		store_switch (ct);
+	if (type_ok(ct, 1)) {
+		umask(ct->c_umask);
+		store_switch(ct);
 		if (ct->c_fp) {
-			fclose (ct->c_fp);
+			fclose(ct->c_fp);
 			ct->c_fp = NULL;
 		}
 		if (ct->c_ceclosefnx)
@@ -135,43 +134,43 @@ store_single_message (CT ct)
 */
 
 static int
-store_switch (CT ct)
+store_switch(CT ct)
 {
 	switch (ct->c_type) {
-		case CT_MULTIPART:
-			return store_multi (ct);
+	case CT_MULTIPART:
+		return store_multi(ct);
+		break;
+
+	case CT_MESSAGE:
+		switch (ct->c_subtype) {
+		case MESSAGE_PARTIAL:
+			return store_partial(ct);
 			break;
 
-		case CT_MESSAGE:
-			switch (ct->c_subtype) {
-				case MESSAGE_PARTIAL:
-					return store_partial (ct);
-					break;
-
-				case MESSAGE_EXTERNAL:
-					return store_external (ct);
-
-				case MESSAGE_RFC822:
-				default:
-					return store_generic (ct);
-					break;
-			}
-			break;
-
-		case CT_APPLICATION:
-			return store_application (ct);
-			break;
-
-		case CT_TEXT:
-		case CT_AUDIO:
-		case CT_IMAGE:
-		case CT_VIDEO:
-			return store_generic (ct);
-			break;
+		case MESSAGE_EXTERNAL:
+			return store_external(ct);
 
+		case MESSAGE_RFC822:
 		default:
-			adios (NULL, "unknown content type %d", ct->c_type);
+			return store_generic(ct);
 			break;
+		}
+		break;
+
+	case CT_APPLICATION:
+		return store_application(ct);
+		break;
+
+	case CT_TEXT:
+	case CT_AUDIO:
+	case CT_IMAGE:
+	case CT_VIDEO:
+		return store_generic(ct);
+		break;
+
+	default:
+		adios(NULL, "unknown content type %d", ct->c_type);
+		break;
 	}
 
 	return OK;  /* NOT REACHED */
@@ -184,7 +183,7 @@ store_switch (CT ct)
 */
 
 static int
-store_generic (CT ct)
+store_generic(CT ct)
 {
 	/*
 	** Check if the content specifies a filename.
@@ -192,9 +191,9 @@ store_generic (CT ct)
 	** (only "message/rfc822" will use store_generic).
 	*/
 	if (autosw && ct->c_type != CT_MESSAGE)
-		get_storeproc (ct);
+		get_storeproc(ct);
 
-	return store_content (ct, NULL);
+	return store_content(ct, NULL);
 }
 
 
@@ -203,14 +202,14 @@ store_generic (CT ct)
 */
 
 static int
-store_application (CT ct)
+store_application(CT ct)
 {
 	char **ap, **ep;
 	CI ci = &ct->c_ctinfo;
 
 	/* Check if the content specifies a filename */
 	if (autosw)
-		get_storeproc (ct);
+		get_storeproc(ct);
 
 	/*
 	** If storeproc is not defined, and the content is type
@@ -222,8 +221,8 @@ store_application (CT ct)
 
 		for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) {
 			/* check for "type=tar" attribute */
-			if (!mh_strcasecmp (*ap, "type")) {
-				if (mh_strcasecmp (*ep, "tar"))
+			if (!mh_strcasecmp(*ap, "type")) {
+				if (mh_strcasecmp(*ep, "tar"))
 					break;
 
 				tarP = 1;
@@ -231,37 +230,37 @@ store_application (CT ct)
 			}
 
 			/* check for "conversions=compress" attribute */
-			if ((!mh_strcasecmp (*ap, "conversions") ||
-					!mh_strcasecmp (*ap, "x-conversions"))
-					&& (!mh_strcasecmp (*ep, "compress") ||
-					!mh_strcasecmp (*ep, "x-compress"))) {
+			if ((!mh_strcasecmp(*ap, "conversions") ||
+					!mh_strcasecmp(*ap, "x-conversions"))
+					&& (!mh_strcasecmp(*ep, "compress") ||
+					!mh_strcasecmp(*ep, "x-compress"))) {
 				zP = 1;
 				continue;
 			}
 			/* check for "conversions=gzip" attribute */
-			if ((!mh_strcasecmp (*ap, "conversions") ||
-					!mh_strcasecmp (*ap, "x-conversions"))
-					&& (!mh_strcasecmp (*ep, "gzip") ||
-					!mh_strcasecmp (*ep, "x-gzip"))) {
+			if ((!mh_strcasecmp(*ap, "conversions") ||
+					!mh_strcasecmp(*ap, "x-conversions"))
+					&& (!mh_strcasecmp(*ep, "gzip") ||
+					!mh_strcasecmp(*ep, "x-gzip"))) {
 				gzP = 1;
 				continue;
 			}
 		}
 
 		if (tarP) {
-			ct->c_showproc = add (zP ? "%euncompress | tar tvf -" : (gzP ? "%egzip -dc | tar tvf -" : "%etar tvf -"), NULL);
+			ct->c_showproc = getcpy(zP ? "%euncompress | tar tvf -" : (gzP ? "%egzip -dc | tar tvf -" : "%etar tvf -"));
 			if (!ct->c_storeproc) {
 				if (autosw) {
-					ct->c_storeproc = add (zP ? "| uncompress | tar xvpf -" : (gzP ? "| gzip -dc | tar xvpf -" : "| tar xvpf -"), NULL);
+					ct->c_storeproc = getcpy(zP ? "| uncompress | tar xvpf -" : (gzP ? "| gzip -dc | tar xvpf -" : "| tar xvpf -"));
 					ct->c_umask = 0022;
 				} else {
-					ct->c_storeproc= add (zP ? "%m%P.tar.Z" : (gzP ? "%m%P.tar.gz" : "%m%P.tar"), NULL);
+					ct->c_storeproc= getcpy(zP ? "%m%P.tar.Z" : (gzP ? "%m%P.tar.gz" : "%m%P.tar"));
 				}
 			}
 		}
 	}
 
-	return store_content (ct, NULL);
+	return store_content(ct, NULL);
 }
 
 
@@ -270,7 +269,7 @@ store_application (CT ct)
 */
 
 static int
-store_multi (CT ct)
+store_multi(CT ct)
 {
 	int result;
 	struct multipart *m = (struct multipart *) ct->c_ctparams;
@@ -280,8 +279,8 @@ store_multi (CT ct)
 	for (part = m->mp_parts; part; part = part->mp_next) {
 		CT  p = part->mp_part;
 
-		if (part_ok (p, 1) && type_ok (p, 1)) {
-			result = store_switch (p);
+		if (part_ok(p, 1) && type_ok(p, 1)) {
+			result = store_switch(p);
 			if (result == OK && ct->c_subtype == MULTI_ALTERNATE)
 				break;
 		}
@@ -297,7 +296,7 @@ store_multi (CT ct)
 */
 
 static int
-store_partial (CT ct)
+store_partial(CT ct)
 {
 	int cur, hi, i;
 	CT p, *ctp, *ctq;
@@ -313,8 +312,9 @@ store_partial (CT ct)
 		p = *ctp;
 		if (p->c_type == CT_MESSAGE && p->c_subtype == ct->c_subtype) {
 			pm = (struct partial *) p->c_ctparams;
-			if (!pm->pm_stored
-					&& strcmp (qm->pm_partid, pm->pm_partid) == 0) {
+			if (!pm->pm_stored &&
+					strcmp(qm->pm_partid, pm->pm_partid)
+					== 0) {
 				pm->pm_marked = pm->pm_partno;
 				if (pm->pm_maxno)
 					hi = pm->pm_maxno;
@@ -326,12 +326,12 @@ store_partial (CT ct)
 	}
 
 	if (hi == 0) {
-		advise (NULL, "missing (at least) last part of multipart message");
+		advise(NULL, "missing (at least) last part of multipart message");
 		return NOTOK;
 	}
 
-	if ((base = (CT *) calloc ((size_t) (i + 1), sizeof(*base))) == NULL)
-		adios (NULL, "out of memory");
+	if ((base = (CT *) calloc((size_t) (i + 1), sizeof(*base))) == NULL)
+		adios(NULL, "out of memory");
 
 	ctq = base;
 	for (ctp = cts; *ctp; ctp++) {
@@ -345,7 +345,7 @@ store_partial (CT ct)
 	*ctq = NULL;
 
 	if (i > 1)
-		qsort ((char *) base, i, sizeof(*base), (qsort_comp) ct_compar);
+		qsort((char *) base, i, sizeof(*base), (qsort_comp) ct_compar);
 
 	cur = 1;
 	for (ctq = base; *ctq; ctq++) {
@@ -353,7 +353,7 @@ store_partial (CT ct)
 		pm = (struct partial *) p->c_ctparams;
 		if (pm->pm_marked != cur) {
 			if (pm->pm_marked == cur - 1) {
-				admonish (NULL, "duplicate part %d of %d part multipart message", pm->pm_marked, hi);
+				admonish(NULL, "duplicate part %d of %d part multipart message", pm->pm_marked, hi);
 				continue;
 			}
 
@@ -375,19 +375,19 @@ missing_part:
 
 	ctq = base;
 	ct = *ctq++;
-	if (store_content (ct, NULL) == NOTOK) {
+	if (store_content(ct, NULL) == NOTOK) {
 losing:
-		free ((char *) base);
+		free((char *) base);
 		return NOTOK;
 	}
 
 	for (; *ctq; ctq++) {
 		p = *ctq;
-		if (store_content (p, ct) == NOTOK)
+		if (store_content(p, ct) == NOTOK)
 			goto losing;
 	}
 
-	free ((char *) base);
+	free((char *) base);
 	return OK;
 }
 
@@ -397,13 +397,13 @@ losing:
 */
 
 static int
-store_external (CT ct)
+store_external(CT ct)
 {
 	int result = NOTOK;
 	struct exbody *e = (struct exbody *) ct->c_ctparams;
 	CT p = e->eb_content;
 
-	if (!type_ok (p, 1))
+	if (!type_ok(p, 1))
 		return OK;
 
 	/*
@@ -413,16 +413,12 @@ store_external (CT ct)
 	if (autosw) {
 		char *cp;
 
-		if ((cp = e->eb_name)
-			&& *cp != '/'
-			&& *cp != '.'
-			&& *cp != '|'
-			&& *cp != '!'
-			&& !strchr (cp, '%')) {
+		if ((cp = e->eb_name) && *cp != '/' && *cp != '.' &&
+				*cp != '|' && *cp != '!' && !strchr(cp, '%')) {
 			if (!ct->c_storeproc)
-				ct->c_storeproc = add (cp, NULL);
+				ct->c_storeproc = getcpy(cp);
 			if (!p->c_storeproc)
-				p->c_storeproc = add (cp, NULL);
+				p->c_storeproc = getcpy(cp);
 		}
 	}
 
@@ -435,7 +431,7 @@ store_external (CT ct)
 	p->c_partno = ct->c_partno;
 
 	/* we probably need to check if content is really there */
-	result = store_switch (p);
+	result = store_switch(p);
 
 	p->c_partno = NULL;
 	return result;
@@ -448,7 +444,7 @@ store_external (CT ct)
 */
 
 static int
-ct_compar (CT *a, CT *b)
+ct_compar(CT *a, CT *b)
 {
 	struct partial *am = (struct partial *) ((*a)->c_ctparams);
 	struct partial *bm = (struct partial *) ((*b)->c_ctparams);
@@ -469,7 +465,7 @@ ct_compar (CT *a, CT *b)
 */
 
 static int
-store_content (CT ct, CT p)
+store_content(CT ct, CT p)
 {
 	int appending = 0, msgnum = 0;
 	int is_partial = 0, first_partial = 0;
@@ -509,11 +505,11 @@ store_content (CT ct, CT p)
 		*/
 		if (p) {
 			appending = 1;
-			ct->c_storage = add (p->c_storage, NULL);
+			ct->c_storage = getcpy(p->c_storage);
 
 			/* record the folder name */
 			if (p->c_folder) {
-				ct->c_folder = add (p->c_folder, NULL);
+				ct->c_folder = getcpy(p->c_folder);
 			}
 			goto got_filename;
 		}
@@ -531,13 +527,15 @@ store_content (CT ct, CT p)
 	if ((cp = ct->c_storeproc) == NULL || *cp == '\0') {
 		CI ci = &ct->c_ctinfo;
 
-		snprintf (buffer, sizeof(buffer), "%s-store-%s/%s",
+		snprintf(buffer, sizeof(buffer), "%s-store-%s/%s",
 				invo_name, ci->ci_type, ci->ci_subtype);
-		if ((cp = context_find (buffer)) == NULL || *cp == '\0') {
-			snprintf (buffer, sizeof(buffer), "%s-store-%s",
+		if ((cp = context_find(buffer)) == NULL || *cp == '\0') {
+			snprintf(buffer, sizeof(buffer), "%s-store-%s",
 					invo_name, ci->ci_type);
-			if ((cp = context_find (buffer)) == NULL || *cp == '\0') {
-				cp = ct->c_type == CT_MESSAGE ? "+" : "%m%P.%s";
+			if ((cp = context_find(buffer)) == NULL ||
+					*cp == '\0') {
+				cp = ct->c_type == CT_MESSAGE ?
+						"+" : "%m%P.%s";
 			}
 		}
 	}
@@ -551,22 +549,22 @@ store_content (CT ct, CT p)
 
 		/* Store content in temporary file for now */
 		tmpfilenam = m_mktemp(invo_name, NULL, NULL);
-		ct->c_storage = add (tmpfilenam, NULL);
+		ct->c_storage = getcpy(tmpfilenam);
 
 		/* Get the folder name */
 		if (cp[1])
-			folder = pluspath (cp);
+			folder = getcpy(expandfol(cp));
 		else
-			folder = getfolder (1);
+			folder = getcurfol();
 
 		/* Check if folder exists */
-		create_folder(m_mailpath(folder), 0, exit);
+		create_folder(toabsdir(folder), 0, exit);
 
 		/* Record the folder name */
-		ct->c_folder = add (folder, NULL);
+		ct->c_folder = getcpy(folder);
 
 		if (cp[1])
-			free (folder);
+			free(folder);
 
 		goto got_filename;
 	}
@@ -575,24 +573,24 @@ store_content (CT ct, CT p)
 	** Parse and expand the storage formatting string
 	** in `cp' into `buffer'.
 	*/
-	parse_format_string (ct, cp, buffer, sizeof(buffer), dir);
+	parse_format_string(ct, cp, buffer, sizeof(buffer), dir);
 
 	/*
 	** If formatting begins with '|' or '!', then pass
 	** content to standard input of a command and return.
 	*/
 	if (buffer[0] == '|' || buffer[0] == '!')
-		return show_content_aux (ct, 1, 0, buffer + 1, dir);
+		return show_content_aux(ct, 1, 0, buffer + 1, dir);
 
 	/* record the filename */
-	ct->c_storage = add (buffer, NULL);
+	ct->c_storage = getcpy(buffer);
 
 got_filename:
 	/* flush the output stream */
-	fflush (stdout);
+	fflush(stdout);
 
 	/* Now save or append the content to a file */
-	if (output_content_file (ct, appending) == NOTOK)
+	if (output_content_file(ct, appending) == NOTOK)
 		return NOTOK;
 
 	/*
@@ -601,8 +599,8 @@ got_filename:
 	** then only do this if it is the last one in the group.
 	*/
 	if (ct->c_folder && (!is_partial || last_partial)) {
-		msgnum = output_content_folder (ct->c_folder, ct->c_storage);
-		unlink (ct->c_storage);
+		msgnum = output_content_folder(ct->c_folder, ct->c_storage);
+		unlink(ct->c_storage);
 		if (msgnum == NOTOK)
 			return NOTOK;
 	}
@@ -613,15 +611,15 @@ got_filename:
 	*/
 	if (is_partial) {
 		if (first_partial)
-			fprintf (stderr, "reassembling partials ");
+			fprintf(stderr, "reassembling partials ");
 		if (last_partial)
-			fprintf (stderr, "%s", ct->c_file);
+			fprintf(stderr, "%s", ct->c_file);
 		else
-			fprintf (stderr, "%s,", ct->c_file);
+			fprintf(stderr, "%s,", ct->c_file);
 	} else {
-		fprintf (stderr, "storing message %s", ct->c_file);
+		fprintf(stderr, "storing message %s", ct->c_file);
 		if (ct->c_partno)
-			fprintf (stderr, " part %s", ct->c_partno);
+			fprintf(stderr, " part %s", ct->c_partno);
 	}
 
 	/*
@@ -631,17 +629,20 @@ got_filename:
 	*/
 	if (!is_partial || last_partial) {
 		if (ct->c_folder) {
-			fprintf (stderr, " to folder %s as message %d\n", ct->c_folder, msgnum);
-		} else if (!strcmp(ct->c_storage, "-")) {
-			fprintf (stderr, " to stdout\n");
+			fprintf(stderr, " to folder %s as message %d\n",
+					ct->c_folder, msgnum);
+		} else if (strcmp(ct->c_storage, "-")==0) {
+			fprintf(stderr, " to stdout\n");
 		} else {
 			int cwdlen;
 
-			cwdlen = strlen (cwd);
-			fprintf (stderr, " as file %s\n",
-				strncmp (ct->c_storage, cwd, cwdlen)
-				|| ct->c_storage[cwdlen] != '/'
-				? ct->c_storage : ct->c_storage + cwdlen + 1);
+			cwdlen = strlen(cwd);
+			fprintf(stderr, " as file %s\n",
+					strncmp(ct->c_storage, cwd,
+					cwdlen)!=0 ||
+					ct->c_storage[cwdlen] != '/' ?
+					ct->c_storage :
+					ct->c_storage + cwdlen + 1);
 		}
 	}
 
@@ -654,7 +655,7 @@ got_filename:
 */
 
 static int
-output_content_file (CT ct, int appending)
+output_content_file(CT ct, int appending)
 {
 	int filterstate;
 	char *file, buffer[BUFSIZ];
@@ -665,24 +666,23 @@ output_content_file (CT ct, int appending)
 	** If the pathname is absolute, make sure
 	** all the relevant directories exist.
 	*/
-	if (strchr(ct->c_storage, '/')
-			&& make_intermediates (ct->c_storage) == NOTOK)
+	if (strchr(ct->c_storage, '/') && make_intermediates(ct->c_storage)
+			== NOTOK)
 		return NOTOK;
 
 	if (ct->c_encoding != CE_7BIT) {
 		int cc, fd;
 
 		if (!ct->c_ceopenfnx) {
-			advise (NULL, "don't know how to decode part %s of message %s",
-					ct->c_partno, ct->c_file);
+			advise(NULL, "don't know how to decode part %s of message %s", ct->c_partno, ct->c_file);
 			return NOTOK;
 		}
 
-		file = appending || !strcmp (ct->c_storage, "-") ? NULL
-														   : ct->c_storage;
+		file = appending || strcmp(ct->c_storage, "-")==0 ?
+				NULL : ct->c_storage;
 		if ((fd = (*ct->c_ceopenfnx) (ct, &file)) == NOTOK)
 			return NOTOK;
-		if (!strcmp (file, ct->c_storage)) {
+		if (strcmp(file, ct->c_storage)==0) {
 			(*ct->c_ceclosefnx) (ct);
 			return OK;
 		}
@@ -690,28 +690,29 @@ output_content_file (CT ct, int appending)
 		/*
 		** Send to standard output
 		*/
-		if (!strcmp (ct->c_storage, "-")) {
+		if (strcmp(ct->c_storage, "-")==0) {
 			int gd;
 
-			if ((gd = dup (fileno (stdout))) == NOTOK) {
-				advise ("stdout", "unable to dup");
+			if ((gd = dup(fileno(stdout))) == NOTOK) {
+				advise("stdout", "unable to dup");
 losing:
 				(*ct->c_ceclosefnx) (ct);
 				return NOTOK;
 			}
-			if ((fp = fdopen (gd, appending ? "a" : "w")) == NULL) {
-				advise ("stdout", "unable to fdopen (%d, \"%s\") from", gd,
-						appending ? "a" : "w");
-				close (gd);
+			if ((fp = fdopen(gd, appending ? "a" : "w")) == NULL) {
+				advise("stdout", "unable to fdopen (%d, \"%s\") from", gd, appending ? "a" : "w");
+				close(gd);
 				goto losing;
 			}
 		} else {
 			/*
 			** Open output file
 			*/
-			if ((fp = fopen (ct->c_storage, appending ? "a" : "w")) == NULL) {
-				advise (ct->c_storage, "unable to fopen for %s",
-						appending ? "appending" : "writing");
+			if ((fp = fopen(ct->c_storage, appending ? "a" : "w"))
+					== NULL) {
+				advise(ct->c_storage, "unable to fopen for %s",
+						appending ?
+						"appending" : "writing");
 				goto losing;
 			}
 		}
@@ -724,60 +725,61 @@ losing:
 			struct partial *pm = (struct partial *) ct->c_ctparams;
 
 			if (pm->pm_partno == 1)
-				copy_some_headers (fp, ct);
+				copy_some_headers(fp, ct);
 		}
 
 		for (;;) {
-			switch (cc = read (fd, buffer, sizeof(buffer))) {
-				case NOTOK:
-					advise (file, "error reading content from");
-					break;
+			switch (cc = read(fd, buffer, sizeof(buffer))) {
+			case NOTOK:
+				advise(file, "error reading content from");
+				break;
 
-				case OK:
-					break;
+			case OK:
+				break;
 
-				default:
-					fwrite (buffer, sizeof(*buffer), cc, fp);
-					continue;
+			default:
+				fwrite(buffer, sizeof(*buffer), cc, fp);
+				continue;
 			}
 			break;
 		}
 
 		(*ct->c_ceclosefnx) (ct);
 
-		if (cc != NOTOK && fflush (fp))
-			advise (ct->c_storage, "error writing to");
+		if (cc != NOTOK && fflush(fp))
+			advise(ct->c_storage, "error writing to");
 
-		fclose (fp);
+		fclose(fp);
 
 		return (cc != NOTOK ? OK : NOTOK);
 	}
 
-	if (!ct->c_fp && (ct->c_fp = fopen (ct->c_file, "r")) == NULL) {
-		advise (ct->c_file, "unable to open for reading");
+	if (!ct->c_fp && (ct->c_fp = fopen(ct->c_file, "r")) == NULL) {
+		advise(ct->c_file, "unable to open for reading");
 		return NOTOK;
 	}
 
 	pos = ct->c_begin;
 	last = ct->c_end;
-	fseek (ct->c_fp, pos, SEEK_SET);
+	fseek(ct->c_fp, pos, SEEK_SET);
 
-	if (!strcmp (ct->c_storage, "-")) {
+	if (strcmp(ct->c_storage, "-")==0) {
 		int gd;
 
-		if ((gd = dup (fileno (stdout))) == NOTOK) {
-			advise ("stdout", "unable to dup");
+		if ((gd = dup(fileno(stdout))) == NOTOK) {
+			advise("stdout", "unable to dup");
 			return NOTOK;
 		}
-		if ((fp = fdopen (gd, appending ? "a" : "w")) == NULL) {
-			advise ("stdout", "unable to fdopen (%d, \"%s\") from", gd,
-					appending ? "a" : "w");
-			close (gd);
+		if ((fp = fdopen(gd, appending ? "a" : "w")) == NULL) {
+			advise("stdout", "unable to fdopen (%d, \"%s\") from",
+					gd, appending ? "a" : "w");
+			close(gd);
 			return NOTOK;
 		}
 	} else {
-		if ((fp = fopen (ct->c_storage, appending ? "a" : "w")) == NULL) {
-			advise (ct->c_storage, "unable to fopen for %s",
+		if ((fp = fopen(ct->c_storage, appending ? "a" : "w"))
+				== NULL) {
+			advise(ct->c_storage, "unable to fopen for %s",
 					appending ? "appending" : "writing");
 			return NOTOK;
 		}
@@ -792,16 +794,16 @@ losing:
 		struct partial *pm = (struct partial *) ct->c_ctparams;
 
 		if (pm->pm_partno == 1) {
-			copy_some_headers (fp, ct);
+			copy_some_headers(fp, ct);
 			filterstate = 1;
 		}
 	}
 
-	while (fgets (buffer, sizeof(buffer) - 1, ct->c_fp)) {
-		if ((pos += strlen (buffer)) > last) {
+	while (fgets(buffer, sizeof(buffer) - 1, ct->c_fp)) {
+		if ((pos += strlen(buffer)) > last) {
 			int diff;
 
-			diff = strlen (buffer) - (pos - last);
+			diff = strlen(buffer) - (pos - last);
 			if (diff >= 0)
 				buffer[diff] = '\0';
 		}
@@ -812,40 +814,36 @@ losing:
 		*/
 		if (filterstate) {
 			switch (buffer[0]) {
-				case ' ':
-				case '\t':
-					if (filterstate < 0)
-						buffer[0] = 0;
-					break;
+			case ' ':
+			case '\t':
+				if (filterstate < 0)
+					buffer[0] = 0;
+				break;
 
-				case '\n':
-					filterstate = 0;
-					break;
+			case '\n':
+				filterstate = 0;
+				break;
 
-				default:
-					if (!uprf (buffer, XXX_FIELD_PRF)
-							&& !uprf (buffer, VRSN_FIELD)
-							&& !uprf (buffer, "Subject:")
-							&& !uprf (buffer, "Encrypted:")
-							&& !uprf (buffer, "Message-ID:")) {
-						filterstate = -1;
-						buffer[0] = 0;
-						break;
-					}
-					filterstate = 1;
+			default:
+				if (!uprf(buffer, XXX_FIELD_PRF) && !uprf(buffer, VRSN_FIELD) && !uprf(buffer, "Subject:") && !uprf(buffer, "Encrypted:") && !uprf(buffer, "Message-ID:")) {
+					filterstate = -1;
+					buffer[0] = 0;
 					break;
+				}
+				filterstate = 1;
+				break;
 			}
 		}
-		fputs (buffer, fp);
+		fputs(buffer, fp);
 		if (pos >= last)
 			break;
 	}
 
-	if (fflush (fp))
-		advise (ct->c_storage, "error writing to");
+	if (fflush(fp))
+		advise(ct->c_storage, "error writing to");
 
-	fclose (fp);
-	fclose (ct->c_fp);
+	fclose(fp);
+	fclose(ct->c_fp);
 	ct->c_fp = NULL;
 	return OK;
 }
@@ -860,22 +858,22 @@ losing:
 */
 
 static int
-output_content_folder (char *folder, char *filename)
+output_content_folder(char *folder, char *filename)
 {
 	int msgnum;
 	struct msgs *mp;
 
 	/* Read the folder. */
-	if ((mp = folder_read (folder))) {
+	if ((mp = folder_read(folder))) {
 		/* Link file into folder */
-		msgnum = folder_addmsg (&mp, filename, 0, 0, 0, 0, (char *)0);
+		msgnum = folder_addmsg(&mp, filename, 0, 0, 0, 0, NULL);
 	} else {
-		advise (NULL, "unable to read folder %s", folder);
+		advise(NULL, "unable to read folder %s", folder);
 		return NOTOK;
 	}
 
 	/* free folder structure */
-	folder_free (mp);
+	folder_free(mp);
 
 	/*
 	** Return msgnum.  We are relying on the fact that
@@ -891,7 +889,7 @@ output_content_folder (char *folder, char *filename)
 */
 
 static int
-parse_format_string (CT ct, char *cp, char *buffer, int buflen, char *dir)
+parse_format_string(CT ct, char *cp, char *buffer, int buflen, char *dir)
 {
 	int len;
 	char *bp;
@@ -902,7 +900,7 @@ parse_format_string (CT ct, char *cp, char *buffer, int buflen, char *dir)
 	** return (send content to standard output).
 	*/
 	if (cp[0] == '-' && cp[1] == '\0') {
-		strncpy (buffer, cp, buflen);
+		strncpy(buffer, cp, buflen);
 		return 0;
 	}
 
@@ -915,8 +913,8 @@ parse_format_string (CT ct, char *cp, char *buffer, int buflen, char *dir)
 	** appropriate directory.
 	*/
 	if (*cp != '/' && *cp != '|' && *cp != '!') {
-		snprintf (bp, buflen, "%s/", dir[1] ? dir : "");
-		len = strlen (bp);
+		snprintf(bp, buflen, "%s/", dir[1] ? dir : "");
+		len = strlen(bp);
 		bp += len;
 		buflen -= len;
 	}
@@ -926,71 +924,75 @@ parse_format_string (CT ct, char *cp, char *buffer, int buflen, char *dir)
 		/* We are processing a storage escape */
 		if (*cp == '%') {
 			switch (*++cp) {
-				case 'a':
-					/*
-					** Insert parameters from Content-Type.
-					** This is only valid for '|' commands.
-					*/
-					if (buffer[0] != '|' && buffer[0] != '!') {
-						*bp++ = *--cp;
-						*bp = '\0';
-						buflen--;
-						continue;
-					} else {
-						char **ap, **ep;
-						char *s = "";
-
-						for (ap = ci->ci_attrs, ep = ci->ci_values;
-								 *ap; ap++, ep++) {
-							snprintf (bp, buflen, "%s%s=\"%s\"", s, *ap, *ep);
-							len = strlen (bp);
-							bp += len;
-							buflen -= len;
-							s = " ";
-						}
+			case 'a':
+				/*
+				** Insert parameters from Content-Type.
+				** This is only valid for '|' commands.
+				*/
+				if (buffer[0] != '|' && buffer[0] != '!') {
+					*bp++ = *--cp;
+					*bp = '\0';
+					buflen--;
+					continue;
+				} else {
+					char **ap, **ep;
+					char *s = "";
+
+					for (ap=ci->ci_attrs, ep=ci->ci_values;
+							 *ap; ap++, ep++) {
+						snprintf(bp, buflen,
+								"%s%s=\"%s\"",
+								s, *ap, *ep);
+						len = strlen(bp);
+						bp += len;
+						buflen -= len;
+						s = " ";
 					}
-					break;
+				}
+				break;
 
-				case 'm':
-					/* insert message number */
-					snprintf (bp, buflen, "%s", r1bindex (ct->c_file, '/'));
-					break;
+			case 'm':
+				/* insert message number */
+				snprintf(bp, buflen, "%s",
+						mhbasename(ct->c_file));
+				break;
 
-				case 'P':
-					/* insert part number with leading dot */
-					if (ct->c_partno)
-						snprintf (bp, buflen, ".%s", ct->c_partno);
-					break;
+			case 'P':
+				/* insert part number with leading dot */
+				if (ct->c_partno)
+					snprintf(bp, buflen, ".%s",
+							ct->c_partno);
+				break;
 
-				case 'p':
-					/* insert part number withouth leading dot */
-					if (ct->c_partno)
-						strncpy (bp, ct->c_partno, buflen);
-					break;
+			case 'p':
+				/* insert part number withouth leading dot */
+				if (ct->c_partno)
+					strncpy(bp, ct->c_partno, buflen);
+				break;
 
-				case 't':
-					/* insert content type */
-					strncpy (bp, ci->ci_type, buflen);
-					break;
+			case 't':
+				/* insert content type */
+				strncpy(bp, ci->ci_type, buflen);
+				break;
 
-				case 's':
-					/* insert content subtype */
-					strncpy (bp, ci->ci_subtype, buflen);
-					break;
+			case 's':
+				/* insert content subtype */
+				strncpy(bp, ci->ci_subtype, buflen);
+				break;
 
-				case '%':
-					/* insert the character % */
-					goto raw;
+			case '%':
+				/* insert the character % */
+				goto raw;
 
-				default:
-					*bp++ = *--cp;
-					*bp = '\0';
-					buflen--;
-					continue;
+			default:
+				*bp++ = *--cp;
+				*bp = '\0';
+				buflen--;
+				continue;
 			}
 
 			/* Advance bp and decrement buflen */
-			len = strlen (bp);
+			len = strlen(bp);
 			bp += len;
 			buflen -= len;
 
@@ -1012,7 +1014,7 @@ raw:
 */
 
 static void
-get_storeproc (CT ct)
+get_storeproc(CT ct)
 {
 	char **ap, **ep, *cp;
 	CI ci = &ct->c_ctinfo;
@@ -1031,13 +1033,10 @@ get_storeproc (CT ct)
 	** the storeproc.
 	*/
 	for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) {
-		if (!mh_strcasecmp (*ap, "name")
-			&& *(cp = *ep) != '/'
-			&& *cp != '.'
-			&& *cp != '|'
-			&& *cp != '!'
-			&& !strchr (cp, '%')) {
-			ct->c_storeproc = add (cp, NULL);
+		if (!mh_strcasecmp(*ap, "name") && *(cp = *ep) != '/' &&
+				*cp != '.' && *cp != '|' && *cp != '!' &&
+				!strchr(cp, '%')) {
+			ct->c_storeproc = getcpy(cp);
 			return;
 		}
 	}
@@ -1050,7 +1049,7 @@ get_storeproc (CT ct)
 */
 
 static int
-copy_some_headers (FILE *out, CT ct)
+copy_some_headers(FILE *out, CT ct)
 {
 	HF hp;
 
@@ -1061,12 +1060,12 @@ copy_some_headers (FILE *out, CT ct)
 		** A few of the header fields of the enclosing
 		** messages are not copied.
 		*/
-		if (!uprf (hp->name, XXX_FIELD_PRF)
-				&& mh_strcasecmp (hp->name, VRSN_FIELD)
-				&& mh_strcasecmp (hp->name, "Subject")
-				&& mh_strcasecmp (hp->name, "Encrypted")
-				&& mh_strcasecmp (hp->name, "Message-ID"))
-			fprintf (out, "%s:%s", hp->name, hp->value);
+		if (!uprf(hp->name, XXX_FIELD_PRF) &&
+				mh_strcasecmp(hp->name, VRSN_FIELD) &&
+				mh_strcasecmp(hp->name, "Subject") &&
+				mh_strcasecmp(hp->name, "Encrypted") &&
+				mh_strcasecmp(hp->name, "Message-ID"))
+			fprintf(out, "%s:%s", hp->name, hp->value);
 		hp = hp->next;  /* next header field */
 	}