lineedit: do not hang on error, but return error indicator.

[oweals/busybox.git] / console-tools / kbd_mode.c

diff --git a/console-tools/kbd_mode.c b/console-tools/kbd_mode.c
index 46ec3fd283cd4c1a7a727fd18b7ff0baa196f75b..14f2ae516e701c56e7c6120c6a373fd1a0014500 100644 (file)
--- a/console-tools/kbd_mode.c
+++ b/console-tools/kbd_mode.c
@@ -1,67 +1,52 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Mini loadkmap implementation for busybox
+ * Mini kbd_mode implementation for busybox
  *
- * Copyright (C) 2007 Loïc Grenié <loic.grenie@gmail.com>
+ * Copyright (C) 2007 Loic Grenie <loic.grenie@gmail.com>
  *   written using Andries Brouwer <aeb@cwi.nl>'s kbd_mode from
  *   console-utils v0.2.3, licensed under GNU GPLv2
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 #include "libbb.h"
 #include <linux/kd.h>
 
 int kbd_mode_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int kbd_mode_main(int argc, char **argv)
+int kbd_mode_main(int argc UNUSED_PARAM, char **argv)
 {
-       static const char opts[] = "saku";
-
-       const char *opt = argv[1];
-       const char *p;
+       enum {
+               SCANCODE  = (1 << 0),
+               ASCII     = (1 << 1),
+               MEDIUMRAW = (1 << 2),
+               UNICODE   = (1 << 3),
+       };
        int fd;
+       unsigned opt;
+       const char *tty_name = CURRENT_TTY;
 
-       fd = get_console_fd();
-       if (fd < 0) /* get_console_fd() already complained */
-               return EXIT_FAILURE;
+       opt = getopt32(argv, "sakuC:", &tty_name);
+       fd = xopen_nonblocking(tty_name);
+       opt &= 0xf; /* clear -C bit, see (*) */
 
-       if (opt == NULL) {
-               /* No arg */
-               const char *msg = "unknown";
-               int mode;
+       if (!opt) { /* print current setting */
+               const char *mode = "unknown";
+               int m;
 
-               ioctl(fd, KDGKBMODE, &mode);
-               switch(mode) {
-               case K_RAW:
-                       msg = "raw (scancode)";
-                       break;
-               case K_XLATE:
-                       msg = "default (ASCII)";
-                       break;
-               case K_MEDIUMRAW:
-                       msg = "mediumraw (keycode)";
-                       break;
-               case K_UNICODE:
-                       msg = "Unicode (UTF-8)";
-                       break;
-               }
-               printf("The keyboard is in %s mode\n", msg);
-       }
-       else if (argc > 2 /* more than 1 arg */
-        || *opt != '-' /* not an option */
-        || (p = strchr(opts, opt[1])) == NULL /* not an option we expect */
-        || opt[2] != '\0' /* more than one option char */
-       ) {
-               bb_show_usage();
-               /* return EXIT_FAILURE; - not reached */
-       }
-       else {
-#if K_RAW != 0 || K_XLATE != 1 || K_MEDIUMRAW != 2 || K_UNICODE != 3
-#error kbd_mode must be changed
-#endif
-               /* The options are in the order of the various K_xxx */
-               ioctl(fd, KDSKBMODE, p - opts);
+               xioctl(fd, KDGKBMODE, &m);
+               if (m == K_RAW)
+                       mode = "raw (scancode)";
+               else if (m == K_XLATE)
+                       mode = "default (ASCII)";
+               else if (m == K_MEDIUMRAW)
+                       mode = "mediumraw (keycode)";
+               else if (m == K_UNICODE)
+                       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);
        }
 
        if (ENABLE_FEATURE_CLEAN_UP)