X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fcomp.c;h=f867593251fb3d2a1b5838d4f3c76a2b77c6c12b;hp=1c45a982d0743a48fb71056fd2aa6807e95e3286;hb=fede6e42d81ce34fd5c1bbe7fb2757b281c2573a;hpb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a

diff --git a/uip/comp.c b/uip/comp.c
index 1c45a98..f867593 100644
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -18,7 +18,7 @@ static struct swit switches[] = {
 #define USESW  2
 	{ "use", 0 },
 #define NUSESW  3
-	{ "nouse", 0 },
+	{ "nouse", 2 },
 #define WHATSW  4
 	{ "whatnowproc program", 0 },
 #define VERSIONSW  5
@@ -41,10 +41,7 @@ main(int argc, char **argv)
 	struct msgs *mp = NULL;
 	char *fmtstr;
 
-
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
 	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
@@ -58,17 +55,18 @@ main(int argc, char **argv)
 			switch (smatch(++cp, switches)) {
 			case AMBIGSW:
 				ambigsw(cp, switches);
-				done(1);
+				/* sysexits.h EX_USAGE */
+				exit(1);
 			case UNKWNSW:
 				adios(NULL, "-%s unknown", cp);
 
 			case HELPSW:
 				snprintf(buf, sizeof(buf), "%s [+folder] [msg] [switches]", invo_name);
 				print_help(buf, switches, 1);
-				done(1);
+				exit(0);
 			case VERSIONSW:
 				print_version(invo_name);
-				done(1);
+				exit(0);
 
 			case EDITRSW:
 				if (!(ed = *argp++) || *ed == '-')
@@ -135,7 +133,8 @@ main(int argc, char **argv)
 			adios(NULL, "no messages in %s", folder);
 		/* parse the message range/sequence/name and set SELECTED */
 		if (!m_convert(mp, msg))
-			done(1);
+			/* sysexits.h EX_USAGE */
+			exit(1);
 		seq_setprev(mp);  /* set the previous-sequence */
 		if (mp->numsel > 1)
 			adios(NULL, "only one message at a time!");
@@ -165,6 +164,6 @@ main(int argc, char **argv)
 
 	context_save();
 	what_now(ed, use, drft, NULL, 0, NULLMP, NULL, cwd);
-	done(1);
+	/* sysexits.h EX_SOFTWARE */
 	return 1;
 }