summaryrefslogtreecommitdiff
path: root/util-linux/fbset.c
diff options
context:
space:
mode:
authorEric Andersen2001-02-16 18:41:12 +0000
committerEric Andersen2001-02-16 18:41:12 +0000
commit733c4ad6ebc092292053e0fb7a7e32c204a3b371 (patch)
tree45a871308c610b20f12f45cc7fef495747038f5c /util-linux/fbset.c
parentfa4f146d7d3600df63f76b1d4d90620d983901c4 (diff)
downloadbusybox-733c4ad6ebc092292053e0fb7a7e32c204a3b371.zip
busybox-733c4ad6ebc092292053e0fb7a7e32c204a3b371.tar.gz
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
Diffstat (limited to 'util-linux/fbset.c')
-rw-r--r--util-linux/fbset.c26
1 files changed, 3 insertions, 23 deletions
diff --git a/util-linux/fbset.c b/util-linux/fbset.c
index f20c284..9acabbe 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();
}
}
}