diff options
Diffstat (limited to 'console-tools/loadkmap.c')
-rw-r--r-- | console-tools/loadkmap.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c index 912291a7d..8f1a9153a 100644 --- a/console-tools/loadkmap.c +++ b/console-tools/loadkmap.c | |||
@@ -24,7 +24,7 @@ struct kbentry { | |||
24 | #define MAX_NR_KEYMAPS 256 | 24 | #define MAX_NR_KEYMAPS 256 |
25 | 25 | ||
26 | int loadkmap_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 26 | int loadkmap_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
27 | int loadkmap_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) | 27 | int loadkmap_main(int argc UNUSED_PARAM, char **argv) |
28 | { | 28 | { |
29 | struct kbentry ke; | 29 | struct kbentry ke; |
30 | int i, j, fd; | 30 | int i, j, fd; |
@@ -32,6 +32,11 @@ int loadkmap_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) | |||
32 | /* const char *tty_name = CURRENT_TTY; */ | 32 | /* const char *tty_name = CURRENT_TTY; */ |
33 | RESERVE_CONFIG_BUFFER(flags, MAX_NR_KEYMAPS); | 33 | RESERVE_CONFIG_BUFFER(flags, MAX_NR_KEYMAPS); |
34 | 34 | ||
35 | /* When user accidentally runs "loadkmap FILE" | ||
36 | * instead of "loadkmap <FILE", we end up waiting for input from tty. | ||
37 | * Let's prevent it: */ | ||
38 | if (argv[1]) | ||
39 | bb_show_usage(); | ||
35 | /* bb_warn_ignoring_args(argv[1]); */ | 40 | /* bb_warn_ignoring_args(argv[1]); */ |
36 | fd = get_console_fd_or_die(); | 41 | fd = get_console_fd_or_die(); |
37 | /* or maybe: | 42 | /* or maybe: |