# HG changeset patch
# User Ivo Smits <Ivo@UFO-Net.nl>
# Date 1483562558 -3600
# Node ID 66d9d80215f0571d08acdd3c9ca5c28ff4e50f94
# Parent  81dfc3046d6203f9ce221d7df9463d29a7ee1cff
Fixed -h and -v return status, fixed source file permissions (thanks github.com/rotty)

diff -r 81dfc3046d62 -r 66d9d80215f0 src/common.c
--- a/src/common.c	Mon Jul 04 11:59:12 2016 +0200
+++ b/src/common.c	Wed Jan 04 21:42:38 2017 +0100
@@ -115,7 +115,7 @@
 }
 
 void print_header() {
-	fprintf(stderr, "UCIS QuickTun "QT_VERSION" (c) 2010-2013 Ivo Smits <Ivo@UCIS.nl>\n");
+	fprintf(stderr, "UCIS QuickTun "QT_VERSION" (c) 2010-2017 Ivo Smits <Ivo@UCIS.nl>\n");
 	fprintf(stderr, "More information: http://wiki.ucis.nl/QuickTun\n");
 }
 
@@ -421,9 +421,11 @@
 	for (i = 1; i < argc; i++) {
 		char* a = argv[i];
 		if (!strcmp(a, "-h") || !strcmp(a, "--help")) {
-			return errorexit("Please read the documentation at http://wiki.ucis.nl/QuickTun");
+			printf("Please read the documentation at http://wiki.ucis.nl/QuickTun\n");
+			return 0;
 		} else if (!strcmp(a, "-v") || !strcmp(a, "--version")) {
-			return errorexit("UCIS QuickTun "QT_VERSION);
+			printf("UCIS QuickTun "QT_VERSION"\n");
+			return 0;
 		} else if (!strcmp(a, "-c")) {
 			gargc = argc;
 			gargv = argv;
@@ -433,7 +435,7 @@
 			return errorexit("Unexpected command line argument");
 		}
 	}
-	return 0;
+	return 1;
 }
 #endif
 
diff -r 81dfc3046d62 -r 66d9d80215f0 src/proto.nacl0.c
--- a/src/proto.nacl0.c	Mon Jul 04 11:59:12 2016 +0200
+++ b/src/proto.nacl0.c	Wed Jan 04 21:42:38 2017 +0100
@@ -99,7 +99,8 @@
 #ifndef COMBINED_BINARY
 int main(int argc, char** argv) {
 	print_header();
-	if (qtprocessargs(argc, argv) < 0) return -1;
+	int rc = qtprocessargs(argc, argv);
+	if (rc <= 0) return rc;
 	return qtrun(&qtproto_nacl0);
 }
 #endif
diff -r 81dfc3046d62 -r 66d9d80215f0 src/proto.nacltai.c
--- a/src/proto.nacltai.c	Mon Jul 04 11:59:12 2016 +0200
+++ b/src/proto.nacltai.c	Wed Jan 04 21:42:38 2017 +0100
@@ -176,7 +176,8 @@
 #ifndef COMBINED_BINARY
 int main(int argc, char** argv) {
 	print_header();
-	if (qtprocessargs(argc, argv) < 0) return -1;
+	int rc = qtprocessargs(argc, argv);
+	if (rc <= 0) return rc;
 	return qtrun(&qtproto_nacltai);
 }
 #endif
diff -r 81dfc3046d62 -r 66d9d80215f0 src/proto.raw.c
--- a/src/proto.raw.c	Mon Jul 04 11:59:12 2016 +0200
+++ b/src/proto.raw.c	Wed Jan 04 21:42:38 2017 +0100
@@ -50,7 +50,8 @@
 #ifndef COMBINED_BINARY
 int main(int argc, char** argv) {
 	print_header();
-	if (qtprocessargs(argc, argv) < 0) return -1;
+	int rc = qtprocessargs(argc, argv);
+	if (rc <= 0) return rc;
 	return qtrun(&qtproto_raw);
 }
 #endif
diff -r 81dfc3046d62 -r 66d9d80215f0 src/proto.salty.c
--- a/src/proto.salty.c	Mon Jul 04 11:59:12 2016 +0200
+++ b/src/proto.salty.c	Wed Jan 04 21:42:38 2017 +0100
@@ -464,7 +464,8 @@
 #ifndef COMBINED_BINARY
 int main(int argc, char** argv) {
 	print_header();
-	if (qtprocessargs(argc, argv) < 0) return -1;
+	int rc = qtprocessargs(argc, argv);
+	if (rc <= 0) return rc;
 	return qtrun(&qtproto_salty);
 }
 #endif
diff -r 81dfc3046d62 -r 66d9d80215f0 src/run.combined.c
--- a/src/run.combined.c	Mon Jul 04 11:59:12 2016 +0200
+++ b/src/run.combined.c	Wed Jan 04 21:42:38 2017 +0100
@@ -50,7 +50,8 @@
 #else
 	getconf = getenv;
 #endif
-	if (qtprocessargs(argc, argv) < 0) return -1;
+	int rc = qtprocessargs(argc, argv);
+	if (rc <= 0) return rc;
 	char* envval;
 	if ((envval = getconf("PROTOCOL"))) {
 		if (strcmp(envval, "raw") == 0) {