add version support

2 files changed, 29 insertions, 11 deletions

diff --git a/src/msgfmt.c b/src/msgfmt.c
index 4b7d37c..9a51c2d 100644
--- a/src/msgfmt.c
+++ b/src/msgfmt.c
@@ -7,12 +7,20 @@
 #include <assert.h>
 #include "poparser.h"
 
-void syntax(void) {
+__attribute__((noreturn))
+static void syntax(void) {
 	fprintf(stdout,
 	"Usage: msgfmt [OPTION] filename.po ...\n");
 	exit(1);
 }
 
+__attribute__((noreturn))
+static void version(void) {
+	fprintf(stdout,
+		"these are not (GNU gettext-tools) 99.9999.9999\n");
+	exit(0);
+}
+
 #define streq(A, B) (!strcmp(A, B))
 #define strstarts(S, W) (memcmp(S, W, sizeof(W) - 1) ? NULL : (S + (sizeof(W) - 1)))
 
@@ -204,7 +212,6 @@ int main(int argc, char**argv) {
 					streq(A+2, "no-hash") ||
 					streq(A+2, "verbose") ||
 					streq(A+2, "statistics") ||
-					streq(A+2, "version") ||
 					strstarts(A+2, "check-accelerators=") ||
 					strstarts(A+2, "resource=") ||
 					strstarts(A+2, "locale=")
@@ -212,6 +219,8 @@ int main(int argc, char**argv) {
 				) {
 				} else if((dest = strstarts(A+2, "output-file="))) {
 					set_file(1, dest, &out);
+				} else if(streq(A+2, "version")) {
+					version();
 				} else if(streq(A+2, "help")) syntax();
 				
 			} else if(streq(A + 1, "o")) {
@@ -224,9 +233,10 @@ int main(int argc, char**argv) {
 				streq(A+1, "f") ||
 				streq(A+1, "a") ||
 				streq(A+1, "c") ||
-				streq(A+1, "C") ||
-				streq(A+1, "v")
+				streq(A+1, "C")
 			) {
+			} else if (streq(A+1, "v")) {
+				version();
 			} else if (streq(A+1, "d")) {
 				// no support for -d at this time
 				fprintf(stderr, "EINVAL\n");
diff --git a/src/msgmerge.c b/src/msgmerge.c
index 46322a9..a82fab4 100644
--- a/src/msgmerge.c
+++ b/src/msgmerge.c
@@ -8,12 +8,19 @@
 #include "poparser.h"
 
 __attribute__((noreturn))
-void syntax(void) {
+static void syntax(void) {
 	fprintf(stdout,
 	"Usage: msgmerge [OPTION] def.po ref.pot\n");
 	exit(1);
 }
 
+__attribute__((noreturn))
+static void version(void) {
+	fprintf(stdout,
+		"these are not (GNU gettext-tools) 99.9999.9999\n");
+	exit(0);
+}
+
 #define streq(A, B) (!strcmp(A, B))
 #define strstarts(S, W) (memcmp(S, W, sizeof(W) - 1) ? NULL : (S + (sizeof(W) - 1)))
 
@@ -170,10 +177,9 @@ int main(int argc, char**argv) {
 					
 					streq(A+2, "verbose") ||
 					streq(A+2, "quiet") ||
-					streq(A+2, "silent") ||
-					streq(A+2, "version")
-					
-				) {
+					streq(A+2, "silent") ) { 
+				} else if(streq(A+2, "version")) {
+					version();
 				} else if((dest = strstarts(A+2, "output-file="))) {
 					set_file(1, dest, &files.out);
 				} else if((dest = strstarts(A+2, "compendium="))) {
@@ -211,9 +217,11 @@ int main(int argc, char**argv) {
 				streq(A+1, "s") ||
 				streq(A+1, "F") ||
 				streq(A+1, "V") ||
-				streq(A+1, "q") ||
-				streq(A+1, "v")
+				streq(A+1, "q")
 			) {
+			
+			} else if (streq(A+1, "v")) {
+				version();
 			} else if (streq(A+1, "D")) {
 				// no support for -D at this time
 				nodir: