X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fdist.c;h=21c67028f30a7303fa35232ef08d3fc80075c837;hb=d254c5e2ad008f26d5fda43c3f24f0a711c7e851;hp=3db8cfc068c54bf46b2bbaee6060ed23736ba5fa;hpb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a;p=mmh

diff --git a/uip/dist.c b/uip/dist.c
index 3db8cfc..21c6702 100644
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -9,12 +9,14 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <fcntl.h>
+#include <unistd.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define ANNOSW  0
 	{ "annotate", 0 },
 #define NANNOSW  1
-	{ "noannotate", 0 },
+	{ "noannotate", 2 },
 #define EDITRSW  2
 	{ "editor editor", 0 },
 #define FORMSW  3
@@ -41,9 +43,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 */
@@ -57,17 +57,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 ANNOSW:
 				anot++;
@@ -138,7 +139,8 @@ main(int argc, char **argv)
 
 	/* 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);
 
 	if (mp->numsel > 1)
@@ -154,6 +156,6 @@ main(int argc, char **argv)
 	context_save();
 
 	what_now(ed, NOUSE, drft, msgnam, 1, mp, anot ? "Resent" : NULL, cwd);
-	done(1);
+	/*sysexits.h EX_SOFTWARE*/
 	return 1;
 }