X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhshow.c;h=9bc7ed325389bd6b047f5ad1bbcc2c85f1ae8ecb;hp=fa7f256258e932293b9846fa6801d8756de5963b;hb=fede6e42d81ce34fd5c1bbe7fb2757b281c2573a;hpb=3480effefa433e71db02129a1e30e454400a54ce

diff --git a/uip/mhshow.c b/uip/mhshow.c
index fa7f256..9bc7ed3 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -20,7 +20,7 @@ static struct swit switches[] = {
 #define VERBSW  0
 	{ "verbose", 0 },
 #define NVERBSW  1
-	{ "noverbose", 0 },
+	{ "noverbose", 2 },
 #define FILESW  2  /* interface from show */
 	{ "file file", 0 },
 #define FORMSW  3
@@ -30,7 +30,7 @@ static struct swit switches[] = {
 #define TYPESW  5
 	{ "type content", 0 },
 #define VERSIONSW  6
-	{ "version", 0 },
+	{ "Version", 0 },
 #define HELPSW  7
 	{ "help", 0 },
 #define DEBUGSW  8
@@ -75,7 +75,7 @@ void show_all_messages(CT *);
 /* mhfree.c */
 void free_content(CT);
 extern CT *cts;
-void freects_done(int) NORETURN;
+void freects_done();
 
 /*
 ** static prototypes
@@ -98,11 +98,9 @@ main(int argc, char **argv)
 	FILE *fp;
 	int ontty = 0;
 
-	done=freects_done;
+	atexit(freects_done);
 
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
 	invo_name = mhbasename(argv[0]);
 	if (mh_strcasecmp(invo_name, "next")==0) {
 		mode = NEXT;
@@ -124,17 +122,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] %s[switches]", invo_name, mode==SHOW ? "[msgs] " : "");
 				print_help(buf, switches, 1);
-				done(1);
+				exit(0);
 			case VERSIONSW:
 				print_version(invo_name);
-				done(1);
+				exit(0);
 
 			case PARTSW:
 				if (!(cp = *argp++) || *cp == '-')
@@ -156,7 +155,7 @@ main(int argc, char **argv)
 
 			case FILESW:
 				if (mode != SHOW) {
-					adios(NULL, "Either call mhshow as `%s' or use -file", invo_name);
+					adios(NULL, "Either call show as `%s' or use -file", invo_name);
 				}
 
 				if (!(cp = *argp++) || (*cp == '-' && cp[1]))
@@ -191,7 +190,7 @@ main(int argc, char **argv)
 			else
 				folder = getcpy(expandfol(cp));
 		} else if (mode != SHOW) {
-			adios(NULL, "Either call mhshow as `%s' or give message arguments", invo_name);
+			adios(NULL, "Either call show as `%s' or give message arguments", invo_name);
 		} else {
 			app_msgarg(&msgs, cp);
 		}
@@ -286,7 +285,8 @@ main(int argc, char **argv)
 		/* parse all the message ranges/sequences and set SELECTED */
 		for (msgnum = 0; msgnum < msgs.size; msgnum++)
 			if (!m_convert(mp, msgs.msgs[msgnum]))
-				done(1);
+				/* sysexits.h EX_USAGE */
+				exit(1);
 
 		/*
 		** Set the SELECT_UNSEEN bit for all the SELECTED messages,
@@ -320,7 +320,7 @@ main(int argc, char **argv)
 	}
 
 	if (!*cts)
-		done(1);
+		exit(1);
 
 	userrs = 1;
 	SIGNAL(SIGQUIT, quitser);
@@ -369,8 +369,7 @@ main(int argc, char **argv)
 		context_save();                    /* save the context file */
 	}
 
-	done(0);
-	return 1;
+	return 0;
 }
 
 
@@ -384,7 +383,7 @@ pipeser(int i)
 		fflush(stderr);
 	}
 
-	done(1);
+	exit(1);
 	/* NOTREACHED */
 }