1 files changed, 29 insertions, 44 deletions

diff --git a/console-tools/kbd_mode.c b/console-tools/kbd_mode.c
index 46ec3fd28..161495719 100644
--- a/console-tools/kbd_mode.c
+++ b/console-tools/kbd_mode.c
@@ -1,6 +1,6 @@
 /* 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>
  *   written using Andries Brouwer <aeb@cwi.nl>'s kbd_mode from
@@ -14,54 +14,39 @@
 #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 ATTRIBUTE_UNUSED argc, char **argv)
 {
-        static const char opts[] = "saku";
-
-        const char *opt = argv[1];
-        const char *p;
         int fd;
-
+        unsigned opt;
+        enum {
+                SCANCODE = (1<<0),
+                ASCII    = (1<<1),
+                MEDIUMRAW= (1<<2),
+                UNICODE  = (1<<3)
+        };
+        static const char KD_xxx[] ALIGN1 = "saku";
+        opt = getopt32(argv, KD_xxx);
         fd = get_console_fd();
-        if (fd < 0) /* get_console_fd() already complained */
+/*      if (fd < 0)
                 return EXIT_FAILURE;
+*/
+        if (!opt) { /* print current setting */
+                const char *mode = "unknown";
+                int m;
 
-        if (opt == NULL) {
-                /* No arg */
-                const char *msg = "unknown";
-                int mode;
-
-                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);
+                ioctl(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 {
+                opt = opt & UNICODE ? 3 : opt >> 1;
+                xioctl(fd, KDSKBMODE, &opt);
         }
 
         if (ENABLE_FEATURE_CLEAN_UP)