Do usage messages the same way all other apps fo them.

Skip printing of available options (can't do this easily).
Based on a patch by Larry Doolittle.
 -Erik

5 files changed, 42 insertions, 46 deletions

diff --git a/applets/usage.h b/applets/usage.h
index c4d301b5e..c16a225a1 100644
--- a/applets/usage.h
+++ b/applets/usage.h
@@ -474,6 +474,18 @@ false_usage_index
 DO_COMMA
 #endif
 
+#if defined BB_FBSET
+#if defined USAGE_ENUM
+fbset_usage_index
+#elif defined USAGE_MESSAGES
+	"fbset [options] [mode]"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+	"\n\nShows and modifies frame buffer device settings"
+#endif
+#endif
+DO_COMMA
+#endif
+
 #if defined BB_FDFLUSH
 #if defined USAGE_ENUM
 fdflush_usage_index
diff --git a/fbset.c b/fbset.c
index f20c284aa..9acabbecb 100644
--- a/fbset.c
+++ b/fbset.c
@@ -334,26 +334,6 @@ static void showmode(struct fb_var_screeninfo *v)
 	printf("endmode\n\n");
 }
 
-static void fbset_usage(void)
-{
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	int i;
-#endif
-
-#ifndef STANDALONE
-	fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n",
-			BB_VER, BB_BT);
-#endif
-	fprintf(stderr, "Usage: fbset [options] [mode]\n");
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	fprintf(stderr, "\nShows and modifies frame buffer device settings\n\n");
-	fprintf(stderr, "The following options are recognized:\n");
-	for (i = 0; g_cmdoptions[i].name; i++)
-		fprintf(stderr, "\t%s\n", g_cmdoptions[i].name);
-#endif
-	exit(-1);
-}
-
 #ifdef STANDALONE
 int main(int argc, char **argv)
 #else
@@ -375,10 +355,10 @@ extern int fbset_main(int argc, char **argv)
 		for (i = 0; g_cmdoptions[i].name; i++) {
 			if (!strcmp(thisarg, g_cmdoptions[i].name)) {
 				if (argc - 1 < g_cmdoptions[i].param_count)
-					fbset_usage();
+					show_usage();
 				switch (g_cmdoptions[i].code) {
 				case CMD_HELP:
-					fbset_usage();
+					show_usage();
 				case CMD_FB:
 					fbdev = argv[1];
 					break;
@@ -423,7 +403,7 @@ extern int fbset_main(int argc, char **argv)
 				mode = *argv;
 				g_options |= OPT_READMODE;
 			} else {
-				fbset_usage();
+				show_usage();
 			}
 		}
 	}
diff --git a/include/usage.h b/include/usage.h
index c4d301b5e..c16a225a1 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -474,6 +474,18 @@ false_usage_index
 DO_COMMA
 #endif
 
+#if defined BB_FBSET
+#if defined USAGE_ENUM
+fbset_usage_index
+#elif defined USAGE_MESSAGES
+	"fbset [options] [mode]"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+	"\n\nShows and modifies frame buffer device settings"
+#endif
+#endif
+DO_COMMA
+#endif
+
 #if defined BB_FDFLUSH
 #if defined USAGE_ENUM
 fdflush_usage_index
diff --git a/usage.h b/usage.h
index c4d301b5e..c16a225a1 100644
--- a/usage.h
+++ b/usage.h
@@ -474,6 +474,18 @@ false_usage_index
 DO_COMMA
 #endif
 
+#if defined BB_FBSET
+#if defined USAGE_ENUM
+fbset_usage_index
+#elif defined USAGE_MESSAGES
+	"fbset [options] [mode]"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+	"\n\nShows and modifies frame buffer device settings"
+#endif
+#endif
+DO_COMMA
+#endif
+
 #if defined BB_FDFLUSH
 #if defined USAGE_ENUM
 fdflush_usage_index
diff --git a/util-linux/fbset.c b/util-linux/fbset.c
index f20c284aa..9acabbecb 100644
--- a/util-linux/fbset.c
+++ b/util-linux/fbset.c
@@ -334,26 +334,6 @@ static void showmode(struct fb_var_screeninfo *v)
 	printf("endmode\n\n");
 }
 
-static void fbset_usage(void)
-{
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	int i;
-#endif
-
-#ifndef STANDALONE
-	fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n\n",
-			BB_VER, BB_BT);
-#endif
-	fprintf(stderr, "Usage: fbset [options] [mode]\n");
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	fprintf(stderr, "\nShows and modifies frame buffer device settings\n\n");
-	fprintf(stderr, "The following options are recognized:\n");
-	for (i = 0; g_cmdoptions[i].name; i++)
-		fprintf(stderr, "\t%s\n", g_cmdoptions[i].name);
-#endif
-	exit(-1);
-}
-
 #ifdef STANDALONE
 int main(int argc, char **argv)
 #else
@@ -375,10 +355,10 @@ extern int fbset_main(int argc, char **argv)
 		for (i = 0; g_cmdoptions[i].name; i++) {
 			if (!strcmp(thisarg, g_cmdoptions[i].name)) {
 				if (argc - 1 < g_cmdoptions[i].param_count)
-					fbset_usage();
+					show_usage();
 				switch (g_cmdoptions[i].code) {
 				case CMD_HELP:
-					fbset_usage();
+					show_usage();
 				case CMD_FB:
 					fbdev = argv[1];
 					break;
@@ -423,7 +403,7 @@ extern int fbset_main(int argc, char **argv)
 				mode = *argv;
 				g_options |= OPT_READMODE;
 			} else {
-				fbset_usage();
+				show_usage();
 			}
 		}
 	}