diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-06-06 18:09:57 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-06-06 18:09:57 +0200 |
| commit | 2fd45c2cdbf51dbafe1f44a49421a45a1cee4907 (patch) | |
| tree | c8db99482dec94e9defd339872d857272398bf84 /console-tools | |
| parent | f2da16f451812f40bed51fd60a304df3d7dfc1bd (diff) | |
| download | busybox-w32-2fd45c2cdbf51dbafe1f44a49421a45a1cee4907.tar.gz busybox-w32-2fd45c2cdbf51dbafe1f44a49421a45a1cee4907.tar.bz2 busybox-w32-2fd45c2cdbf51dbafe1f44a49421a45a1cee4907.zip | |
dumpkmap,loadkmap: abort if there are params on cmdline
function old new delta
loadkmap_main 201 219 +18
dumpkmap_main 208 223 +15
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'console-tools')
| -rw-r--r-- | console-tools/dumpkmap.c | 7 | ||||
| -rw-r--r-- | console-tools/loadkmap.c | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/console-tools/dumpkmap.c b/console-tools/dumpkmap.c index 061fc4792..a03b59340 100644 --- a/console-tools/dumpkmap.c +++ b/console-tools/dumpkmap.c | |||
| @@ -24,12 +24,17 @@ struct kbentry { | |||
| 24 | #define MAX_NR_KEYMAPS 256 | 24 | #define MAX_NR_KEYMAPS 256 |
| 25 | 25 | ||
| 26 | int dumpkmap_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 26 | int dumpkmap_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
| 27 | int dumpkmap_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) | 27 | int dumpkmap_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; |
| 31 | RESERVE_CONFIG_BUFFER(flags, MAX_NR_KEYMAPS); | 31 | RESERVE_CONFIG_BUFFER(flags, MAX_NR_KEYMAPS); |
| 32 | 32 | ||
| 33 | /* When user accidentally runs "dumpkmap FILE" | ||
| 34 | * instead of "dumpkmap >FILE", we'd dump binary stuff to tty. | ||
| 35 | * Let's prevent it: */ | ||
| 36 | if (argv[1]) | ||
| 37 | bb_show_usage(); | ||
| 33 | /* bb_warn_ignoring_args(argv[1]);*/ | 38 | /* bb_warn_ignoring_args(argv[1]);*/ |
| 34 | 39 | ||
| 35 | fd = get_console_fd_or_die(); | 40 | fd = get_console_fd_or_die(); |
diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c index 912291a7d..9e2c779e0 100644 --- a/console-tools/loadkmap.c +++ b/console-tools/loadkmap.c | |||
| @@ -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: |