find:: get rid of nested function (it's a gcc-ism)

[oweals/busybox.git] / console-tools / loadkmap.c

diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c
index 912291a7dd11511f00c079ba688b646df79e310e..bcffe16b123815b3768658cc0920d7d5d3237199 100644 (file)
--- a/console-tools/loadkmap.c
+++ b/console-tools/loadkmap.c
@@ -4,8 +4,18 @@
  *
  * Copyright (C) 1998 Enrique Zanardi <ezanardi@ull.es>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+
+//usage:#define loadkmap_trivial_usage
+//usage:       "< keymap"
+//usage:#define loadkmap_full_usage "\n\n"
+//usage:       "Load a binary keyboard translation table from stdin\n"
+/* //usage:     "\n    -C TTY  Affect TTY instead of /dev/tty" */
+//usage:
+//usage:#define loadkmap_example_usage
+//usage:       "$ loadkmap < /etc/i18n/lang-keymap\n"
+
 #include "libbb.h"
 
 #define BINARY_KEYMAP_MAGIC "bkeymap"
@@ -24,7 +34,7 @@ struct kbentry {
 #define MAX_NR_KEYMAPS  256
 
 int loadkmap_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int loadkmap_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
+int loadkmap_main(int argc UNUSED_PARAM, char **argv)
 {
        struct kbentry ke;
        int i, j, fd;
@@ -32,6 +42,11 @@ int loadkmap_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 /*     const char *tty_name = CURRENT_TTY; */
        RESERVE_CONFIG_BUFFER(flags, MAX_NR_KEYMAPS);
 
+       /* When user accidentally runs "loadkmap FILE"
+        * instead of "loadkmap <FILE", we end up waiting for input from tty.
+        * Let's prevent it: */
+       if (argv[1])
+               bb_show_usage();
 /* bb_warn_ignoring_args(argv[1]); */
        fd = get_console_fd_or_die();
 /* or maybe: