diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-08-06 12:17:46 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-08-06 12:17:46 +0200 |
| commit | 32b60cc0db90e517399ca9fa73a8ac1140db810d (patch) | |
| tree | ecc6d2bb067319f1c9511cc5e04d4e6eb0ec302b /console-tools | |
| parent | 6517bbc76c5e79273f72b951362125241552935d (diff) | |
| download | busybox-w32-32b60cc0db90e517399ca9fa73a8ac1140db810d.tar.gz busybox-w32-32b60cc0db90e517399ca9fa73a8ac1140db810d.tar.bz2 busybox-w32-32b60cc0db90e517399ca9fa73a8ac1140db810d.zip | |
kbd_mode: try harder to find console device if -C TTY is not given
Was (under X):
$ ./busybox_old kbd_mode
kbd_mode: ioctl 0x4b44 failed: Inappropriate ioctl for device
Now:
$ ./busybox kbd_mode
The keyboard is in off mode
function old new delta
kbd_mode_main 166 174 +8
packed_usage 31782 31764 -18
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/1 up/down: 8/-18) Total: -10 bytes
text data bss dec hex filename
915757 485 6880 923122 e15f2 busybox_old
915747 485 6880 923112 e15e8 busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'console-tools')
| -rw-r--r-- | console-tools/kbd_mode.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/console-tools/kbd_mode.c b/console-tools/kbd_mode.c index da31af28d..b0b594614 100644 --- a/console-tools/kbd_mode.c +++ b/console-tools/kbd_mode.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | //usage:#define kbd_mode_trivial_usage | 22 | //usage:#define kbd_mode_trivial_usage |
| 23 | //usage: "[-a|k|s|u] [-C TTY]" | 23 | //usage: "[-a|k|s|u] [-C TTY]" |
| 24 | //usage:#define kbd_mode_full_usage "\n\n" | 24 | //usage:#define kbd_mode_full_usage "\n\n" |
| 25 | //usage: "Report or set the keyboard mode\n" | 25 | //usage: "Report or set VT console keyboard mode\n" |
| 26 | //usage: "\n -a Default (ASCII)" | 26 | //usage: "\n -a Default (ASCII)" |
| 27 | //usage: "\n -k Medium-raw (keycode)" | 27 | //usage: "\n -k Medium-raw (keycode)" |
| 28 | //usage: "\n -s Raw (scancode)" | 28 | //usage: "\n -s Raw (scancode)" |
| @@ -43,15 +43,20 @@ int kbd_mode_main(int argc UNUSED_PARAM, char **argv) | |||
| 43 | }; | 43 | }; |
| 44 | int fd; | 44 | int fd; |
| 45 | unsigned opt; | 45 | unsigned opt; |
| 46 | //TODO? kbd-2.0.3 without -C tries in sequence: | 46 | const char *tty_name; |
| 47 | //fd#0, /dev/tty, /dev/tty0. | ||
| 48 | //Also, it checks KDGKBTYPE before doing KDGKBMODE | ||
| 49 | //maybe we can use get_console_fd_or_die()? | ||
| 50 | const char *tty_name = CURRENT_TTY; | ||
| 51 | 47 | ||
| 52 | opt = getopt32(argv, "sakuC:", &tty_name); | 48 | opt = getopt32(argv, "sakuC:", &tty_name); |
| 53 | fd = xopen_nonblocking(tty_name); | 49 | if (opt & 0x10) { |
| 54 | opt &= 0xf; /* clear -C bit, see (*) */ | 50 | opt &= 0xf; /* clear -C bit, see (*) */ |
| 51 | fd = xopen_nonblocking(tty_name); | ||
| 52 | } else { | ||
| 53 | /* kbd-2.0.3 tries in sequence: | ||
| 54 | * fd#0, /dev/tty, /dev/tty0. | ||
| 55 | * get_console_fd_or_die: /dev/console, /dev/tty0, /dev/tty. | ||
| 56 | * kbd-2.0.3 checks KDGKBTYPE, get_console_fd_or_die checks too. | ||
| 57 | */ | ||
| 58 | fd = get_console_fd_or_die(); | ||
| 59 | } | ||
| 55 | 60 | ||
| 56 | if (!opt) { /* print current setting */ | 61 | if (!opt) { /* print current setting */ |
| 57 | const char *mode = "unknown"; | 62 | const char *mode = "unknown"; |
| @@ -79,6 +84,7 @@ int kbd_mode_main(int argc UNUSED_PARAM, char **argv) | |||
| 79 | * #define K_OFF 0x04 | 84 | * #define K_OFF 0x04 |
| 80 | * (looks like "-ak" together would cause the same effect as -u) | 85 | * (looks like "-ak" together would cause the same effect as -u) |
| 81 | */ | 86 | */ |
| 87 | opt &= 0xf; /* clear -C bit */ | ||
| 82 | opt = opt & UNICODE ? 3 : opt >> 1; | 88 | opt = opt & UNICODE ? 3 : opt >> 1; |
| 83 | /* double cast prevents warnings about widening conversion */ | 89 | /* double cast prevents warnings about widening conversion */ |
| 84 | xioctl(fd, KDSKBMODE, (void*)(ptrdiff_t)opt); | 90 | xioctl(fd, KDSKBMODE, (void*)(ptrdiff_t)opt); |