diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-11-08 21:39:06 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-11-08 21:39:06 +0000 |
commit | dc70069a466a62c7a8392c576423be2d5c22bbcf (patch) | |
tree | ad26e9d1485a4ee17a841b34274554ab2109b115 /console-tools/loadkmap.c | |
parent | 2a8329e0e9d1d6dcbcec27f01b0affef67a33554 (diff) | |
download | busybox-w32-dc70069a466a62c7a8392c576423be2d5c22bbcf.tar.gz busybox-w32-dc70069a466a62c7a8392c576423be2d5c22bbcf.tar.bz2 busybox-w32-dc70069a466a62c7a8392c576423be2d5c22bbcf.zip |
kbd_mode: support -C TTY option
function old new delta
packed_usage 25334 25361 +27
kbd_mode_main 146 173 +27
Diffstat (limited to 'console-tools/loadkmap.c')
-rw-r--r-- | console-tools/loadkmap.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c index 56948e0d0..ac2c0a6e0 100644 --- a/console-tools/loadkmap.c +++ b/console-tools/loadkmap.c | |||
@@ -5,9 +5,7 @@ | |||
5 | * Copyright (C) 1998 Enrique Zanardi <ezanardi@ull.es> | 5 | * Copyright (C) 1998 Enrique Zanardi <ezanardi@ull.es> |
6 | * | 6 | * |
7 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 7 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
8 | * | ||
9 | */ | 8 | */ |
10 | |||
11 | #include "libbb.h" | 9 | #include "libbb.h" |
12 | 10 | ||
13 | #define BINARY_KEYMAP_MAGIC "bkeymap" | 11 | #define BINARY_KEYMAP_MAGIC "bkeymap" |
@@ -31,11 +29,15 @@ int loadkmap_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) | |||
31 | struct kbentry ke; | 29 | struct kbentry ke; |
32 | int i, j, fd; | 30 | int i, j, fd; |
33 | uint16_t ibuff[NR_KEYS]; | 31 | uint16_t ibuff[NR_KEYS]; |
32 | /* const char *tty_name = CURRENT_TTY; */ | ||
34 | RESERVE_CONFIG_BUFFER(flags,MAX_NR_KEYMAPS); | 33 | RESERVE_CONFIG_BUFFER(flags,MAX_NR_KEYMAPS); |
35 | 34 | ||
36 | /* bb_warn_ignoring_args(argc>=2);*/ | 35 | /* bb_warn_ignoring_args(argc >= 2); */ |
37 | |||
38 | fd = get_console_fd_or_die(); | 36 | fd = get_console_fd_or_die(); |
37 | /* or maybe: | ||
38 | opt = getopt32(argv, "C:", &tty_name); | ||
39 | fd = xopen(tty_name, O_NONBLOCK); | ||
40 | */ | ||
39 | 41 | ||
40 | xread(STDIN_FILENO, flags, 7); | 42 | xread(STDIN_FILENO, flags, 7); |
41 | if (strncmp(flags, BINARY_KEYMAP_MAGIC, 7)) | 43 | if (strncmp(flags, BINARY_KEYMAP_MAGIC, 7)) |