X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhparam.c;h=2c61e608076236bb2042a0b4d414215412dc7686;hp=d29f73adb680227616e72adb8338b3a9a62b879c;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=3730bae9fe289aee86ce0ba57fdfd43857fcedc0

diff --git a/uip/mhparam.c b/uip/mhparam.c
index d29f73a..2c61e60 100644
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -10,6 +10,7 @@
 */
 
 #include <h/mh.h>
+#include <sysexits.h>
 
 static struct swit switches[] = {
 #define COMPSW  0
@@ -27,6 +28,8 @@ static struct swit switches[] = {
 	{ NULL, 0 }
 };
 
+char *version=VERSION;
+
 struct proc {
 	char *p_name;
 	char **p_field;
@@ -40,8 +43,8 @@ char *empty = "";
 */
 static struct proc procs [] = {
 	{ "#--Version--", &empty },
-	{ "version",          &version_num },
-	{ "version-str",      &version_str },
+	{ "version",          &version },
+	{ "lib-version",      &lib_version },
 
 	{ "#--Path-and-File-Names--", &empty },
 	{ "mypath",          &mypath },
@@ -97,17 +100,18 @@ static struct proc procs [] = {
 	{ "replgroupcomps",    &replgroupcomps },
 	{ "mhlformat",         &mhlformat },
 	{ "mhlreply",          &mhlreply },
+	{ "scanformat",        &scanformat },
 
 	{ "#--Default-Sequence-Names--", &empty },
-	{ "seq-all",          &seq_all },
-	{ "seq-beyond",       &seq_beyond },
-	{ "seq-cur",          &seq_cur },
-	{ "seq-first",        &seq_first },
-	{ "seq-last",         &seq_last },
-	{ "seq-next",         &seq_next },
-	{ "seq-prev",         &seq_prev },
-	{ "seq-unseen",       &seq_unseen },
-	{ "seq-neg",          &seq_neg },
+	{ "seq-all",           &seq_all },
+	{ "seq-beyond",        &seq_beyond },
+	{ "seq-cur",           &seq_cur },
+	{ "seq-first",         &seq_first },
+	{ "seq-last",          &seq_last },
+	{ "seq-next",          &seq_next },
+	{ "previous-sequence", &seq_prev },
+	{ "unseen-sequence",   &seq_unseen },
+	{ "sequence-negation", &seq_neg },
 
 	{ NULL,            NULL },
 };
@@ -140,17 +144,17 @@ main(int argc, char **argv)
 			switch (smatch(++cp, switches)) {
 			case AMBIGSW:
 				ambigsw(cp, switches);
-				done(1);
+				exit(EX_USAGE);
 			case UNKWNSW:
-				adios(NULL, "-%s unknown", cp);
+				adios(EX_USAGE, NULL, "-%s unknown", cp);
 
 			case HELPSW:
 				snprintf(buf, sizeof(buf), "%s [profile-components] [switches]", invo_name);
 				print_help(buf, switches, 1);
-				done(1);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
 			case VERSIONSW:
 				print_version(invo_name);
-				done(1);
+				exit(argc == 2 ? EX_OK : EX_USAGE);
 
 			case COMPSW:
 				components = 1;
@@ -203,7 +207,7 @@ main(int argc, char **argv)
 			components = compp > 1;
 
 		for (i = 0; i < compp; i++)  {
-			register char *value;
+			char *value;
 
 			value = context_find(comps[i]);
 			if (!value)
@@ -218,8 +222,7 @@ main(int argc, char **argv)
 		}
 	}
 
-	done(missed);
-	return 1;
+	return missed;
 }