X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/ca9488ce89bd4895db0341db393ec03696b4ebd3..HEAD:/test/decodeindex.c

diff --git a/test/decodeindex.c b/test/decodeindex.c
index c072a07..1d4643b 100644
--- a/test/decodeindex.c
+++ b/test/decodeindex.c
@@ -1,6 +1,6 @@
 /*
  * Tool for decoding compact index values for testing.
- * Copyright © 2012 Nick Bowler
+ * Copyright © 2012, 2022 Nick Bowler
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
@@ -38,13 +38,10 @@ static void print_usage(FILE *f)
 	fprintf(f, "Usage: %s [options] index [index ...]\n", progname);
 }
 
-static void print_version(void)
+static void print_help(void)
 {
-	printf("%s (%s) %s\n", PROGNAME, PACKAGE_NAME, PACKAGE_VERSION);
-	puts("Copyright (C) 2012 Nick Bowler.");
-	puts("License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.");
-	puts("This is free software: you are free to change and redistribute it.");
-	puts("There is NO WARRANTY, to the extent permitted by law.");
+	print_usage(stdout);
+	test_print_options(lopts);
 }
 
 static void print_bytes(FILE *f, int indent, void *buf, size_t n)
@@ -52,7 +49,7 @@ static void print_bytes(FILE *f, int indent, void *buf, size_t n)
 	fprintf(f, "%*s", indent, "");
 
 	if (n == 0) {
-		printf("(empty)\n");
+		fprintf(f, "(empty)\n");
 		return;
 	}
 
@@ -78,7 +75,7 @@ static int print_index(const char *hex)
 		                progname, hex);
 		goto out;
 	}
-		
+
 	rc = upkg_decode_index(&index, buf, n);
 	if (rc == 0) {
 		fprintf(stderr, "%s: invalid index encoding:\n", progname);
@@ -106,10 +103,10 @@ int main(int argc, char **argv)
 	while ((opt = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) {
 		switch (opt) {
 		case 'V':
-			print_version();
+			test_print_version(PROGNAME);
 			return EXIT_SUCCESS;
 		case 'H':
-			print_usage(stdout);
+			print_help();
 			return EXIT_SUCCESS;
 		default:
 			print_usage(stderr);