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

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 12e6548..1b2afa5 100644
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -32,7 +32,7 @@ static struct swit switches[] = {
 #define VERBSW  0
 	{ "verbose", 0 },
 #define NVERBSW  1
-	{ "noverbose", 0 },
+	{ "noverbose", 2 },
 #define VERSIONSW  2
 	{ "Version", 0 },
 #define HELPSW  3
@@ -111,15 +111,13 @@ 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;
 
 	done = unlink_done;
 
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
 	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
@@ -222,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),
@@ -257,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),
@@ -270,14 +264,14 @@ 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(compfile, "unable to rename comp draft %s to", buffer);
+		adios(buffer, "unable to rename draft %s to", compfile);
 	}
 
 	/* Rename output file to take its place */
 	if (rename(outfile, compfile) == NOTOK) {
-		advise(outfile, "unable to rename output %s to", compfile);
+		advise(compfile, "unable to rename output %s to", outfile);
 		rename(buffer, compfile);
 		done(1);
 	}
@@ -790,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))