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 | |
| parent | 2a8329e0e9d1d6dcbcec27f01b0affef67a33554 (diff) | |
| download | busybox-dc70069a466a62c7a8392c576423be2d5c22bbcf.tar.gz | |
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')
| -rw-r--r-- | console-tools/kbd_mode.c | 17 | ||||
| -rw-r--r-- | console-tools/loadfont.c | 5 | ||||
| -rw-r--r-- | console-tools/loadkmap.c | 10 |
3 files changed, 19 insertions, 13 deletions
diff --git a/console-tools/kbd_mode.c b/console-tools/kbd_mode.c index 13a82d7fa..c8451e72d 100644 --- a/console-tools/kbd_mode.c +++ b/console-tools/kbd_mode.c @@ -7,26 +7,26 @@ * console-utils v0.2.3, licensed under GNU GPLv2 * * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. - * */ - #include "libbb.h" #include <linux/kd.h> int kbd_mode_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int kbd_mode_main(int argc UNUSED_PARAM, char **argv) { - int fd; - unsigned opt; enum { SCANCODE = (1 << 0), ASCII = (1 << 1), MEDIUMRAW = (1 << 2), - UNICODE = (1 << 3) + UNICODE = (1 << 3), }; - static const char KD_xxx[] ALIGN1 = "saku"; - opt = getopt32(argv, KD_xxx); - fd = get_console_fd_or_die(); + int fd; + unsigned opt; + const char *tty_name = CURRENT_TTY; + + opt = getopt32(argv, "sakuC:", &tty_name); + fd = xopen(tty_name, O_NONBLOCK); + opt &= 0xf; /* clear -C bit, see (*) */ if (!opt) { /* print current setting */ const char *mode = "unknown"; @@ -43,6 +43,7 @@ int kbd_mode_main(int argc UNUSED_PARAM, char **argv) mode = "Unicode (UTF-8)"; printf("The keyboard is in %s mode\n", mode); } else { + /* here we depend on specific bits assigned to options (*) */ opt = opt & UNICODE ? 3 : opt >> 1; /* double cast prevents warnings about widening conversion */ xioctl(fd, KDSKBMODE, (void*)(ptrdiff_t)opt); diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c index c6a3a4cd8..863c6efcd 100644 --- a/console-tools/loadfont.c +++ b/console-tools/loadfont.c @@ -80,7 +80,10 @@ static void do_loadfont(int fd, unsigned char *inbuf, int unit, int fontsize) } #if 0 -/* These ones do not honour -C tty (they set font on current tty regardless) */ +/* These ones do not honour -C tty (they set font on current tty regardless) + * On x86, this distinction is visible on framebuffer consoles + * (regular character consoles may have only one shared font anyway) + */ #if defined(PIO_FONTX) && !defined(__sparc__) { struct consolefontdesc cfd; 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 @@ * Copyright (C) 1998 Enrique Zanardi <ezanardi@ull.es> * * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. - * */ - #include "libbb.h" #define BINARY_KEYMAP_MAGIC "bkeymap" @@ -31,11 +29,15 @@ int loadkmap_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) struct kbentry ke; int i, j, fd; uint16_t ibuff[NR_KEYS]; +/* const char *tty_name = CURRENT_TTY; */ RESERVE_CONFIG_BUFFER(flags,MAX_NR_KEYMAPS); -/* bb_warn_ignoring_args(argc>=2);*/ - +/* bb_warn_ignoring_args(argc >= 2); */ fd = get_console_fd_or_die(); +/* or maybe: + opt = getopt32(argv, "C:", &tty_name); + fd = xopen(tty_name, O_NONBLOCK); +*/ xread(STDIN_FILENO, flags, 7); if (strncmp(flags, BINARY_KEYMAP_MAGIC, 7)) |