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

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 0fb5315..b22c137 100644
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -32,16 +32,12 @@ static struct swit switches[] = {
 #define VERBSW  0
 	{ "verbose", 0 },
 #define NVERBSW  1
-	{ "noverbose", 0 },
-#define CONTENTIDSW  2
-	{ "contentid", 0 },
-#define NCONTENTIDSW  3
-	{ "nocontentid", 0 },
-#define VERSIONSW  4
-	{ "version", 0 },
-#define HELPSW  5
+	{ "noverbose", 2 },
+#define VERSIONSW  2
+	{ "Version", 0 },
+#define HELPSW  3
 	{ "help", 0 },
-#define DEBUGSW  6
+#define DEBUGSW  4
 	{ "debug", -5 },
 	{ NULL, 0 }
 };
@@ -87,8 +83,6 @@ static CT build_mime(char *);
 int debugsw = 0;
 int verbosw = 0;
 
-int contentidsw = 1;
-
 /*
 ** Temporary files
 */
@@ -123,9 +117,7 @@ main(int argc, char **argv)
 
 	done = unlink_done;
 
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
 	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
@@ -159,13 +151,6 @@ main(int argc, char **argv)
 				print_version(invo_name);
 				done(1);
 
-			case CONTENTIDSW:
-				contentidsw = 1;
-				continue;
-			case NCONTENTIDSW:
-				contentidsw = 0;
-				continue;
-
 			case VERBSW:
 				verbosw++;
 				continue;
@@ -285,12 +270,12 @@ main(int argc, char **argv)
 	/* Rename composition draft */
 	snprintf(buffer, sizeof(buffer), "%s.orig", m_backup(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);
 	}
@@ -1553,9 +1538,9 @@ build_headers(CT ct)
 	add_header(ct, np, vp);
 
 	/*
-	** output the Content-ID, unless disabled by -nocontentid
+	** output the Content-ID
 	*/
-	if (contentidsw && ct->c_id) {
+	if (ct->c_id) {
 		np = getcpy(ID_FIELD);
 		vp = concat(" ", ct->c_id, NULL);
 		add_header(ct, np, vp);