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

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 0fb5315..12e6548 100644
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -33,15 +33,11 @@ static struct swit switches[] = {
 	{ "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
+#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
 */
@@ -159,13 +153,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;
@@ -1553,9 +1540,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);