X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhbuild.c;h=1b2afa58db8e8aa0fd76c70dc0ac9ba6af3dbd97;hb=f3380fda9da04a7c26a76070888ece92ae5648e9;hp=b22c137dad0ecc2d0ff294ddb040466dacca248f;hpb=b5e6b7321a4aa439a32ae448e43343568fa13cbe;p=mmh

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index b22c137..1b2afa5 100644
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -111,7 +111,7 @@ main(int argc, char **argv)
 	char *cp, buf[BUFSIZ];
 	char buffer[BUFSIZ], *compfile = NULL;
 	char **argp, **arguments;
-	CT ct, cts[2];
+	CT ct;
 	FILE *fp = NULL;
 	FILE *fp_out = NULL;
 
@@ -220,8 +220,6 @@ main(int argc, char **argv)
 
 		/* build the content structures for MIME message */
 		ct = build_mime(infile);
-		cts[0] = ct;
-		cts[1] = NULL;
 
 		/* output MIME message to this temporary file */
 		strncpy(outfile, m_mktemp(invo_name, NULL, &fp_out),
@@ -255,8 +253,6 @@ main(int argc, char **argv)
 
 	/* build the content structures for MIME message */
 	ct = build_mime(compfile);
-	cts[0] = ct;
-	cts[1] = NULL;
 
 	/* output MIME message to this temporary file */
 	strncpy(outfile, m_mktemp2(compfile, invo_name, NULL, &fp_out),
@@ -268,7 +264,7 @@ main(int argc, char **argv)
 	fclose(fp_out);
 
 	/* Rename composition draft */
-	snprintf(buffer, sizeof(buffer), "%s.orig", m_backup(compfile));
+	snprintf(buffer, sizeof(buffer), "%s.orig", compfile);
 	if (rename(compfile, buffer) == NOTOK) {
 		adios(buffer, "unable to rename draft %s to", compfile);
 	}
@@ -788,8 +784,8 @@ call_init:
 				adios(NULL, "sorry, \"#%s/%s\" isn't supported", ci->ci_type, ci->ci_subtype);
 			}
 use_forw:
-			adios(NULL, "use \"#forw [+folder] [msgs]\" instead of \"#%s/%s\"", ci->ci_type, ci->ci_subtype);
-			/* NOTREACHED */
+			admonish(NULL, "use \"#forw [+folder] [msgs]\" instead of \"#%s/%s\"", ci->ci_type, ci->ci_subtype);
+			/* FALL */
 
 		default:
 			if ((ct->c_ctinitfnx = s2i->si_init))