I forgot to add usage.h, so here it is, with a few extra cleanups.

Also update show_usage to handle the updated usage.h.  Again,
nearly all the work to get usage.h into shape was done by
Manuel Novoa III.
 -Erik

1 files changed, 8 insertions, 2 deletions

diff --git a/utility.c b/utility.c
index 818523c38..89b601d04 100644
--- a/utility.c
+++ b/utility.c
@@ -84,11 +84,17 @@ extern void show_usage(void)
 	static const char no_help[] = "No help available.\n";
 
 	const char *usage_string = no_help;
+	int i;
 
 	if (applet_using->usage_index >= 0) {
-			usage_string = usage_messages[applet_using->usage_index];
+		usage_string = usage_messages;
+		for (i=applet_using->usage_index ; i>0 ; ) {
+			if (!*usage_string++) {
+				--i;
+			}
+		}
 	}
-	fprintf(stderr, "%s\n\nUsage: %s %s\n", full_version,
+	fprintf(stderr, "%s\n\nUsage: %s %s\n\n", full_version,
 			applet_using->name, usage_string);
 	exit(EXIT_FAILURE);
 }