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

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

diff --git a/console-tools/setkeycodes.c b/console-tools/setkeycodes.c
index b7851016af4baa05958d65d968937fc9ac9b777b..ca8cd21c2a92c66360fbc2d03866ae830d23e99d 100644 (file)
--- a/console-tools/setkeycodes.c
+++ b/console-tools/setkeycodes.c
@@ -6,7 +6,7 @@
  *
  * Adjusted for BusyBox by Erik Andersen <andersen@codepoet.org>
  *
- * 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"
 
@@ -21,7 +21,7 @@ enum {
 int setkeycodes_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int setkeycodes_main(int argc, char **argv)
 {
-       int fd, sc;
+       int fd;
        struct kbkeycode a;
 
        if (!(argc & 1) /* if even */ || argc < 2) {
@@ -30,17 +30,17 @@ int setkeycodes_main(int argc, char **argv)
 
        fd = get_console_fd_or_die();
 
-       while (argc > 2) {
-               a.keycode = xatou_range(argv[2], 0, 127);
-               a.scancode = sc = xstrtoul_range(argv[1], 16, 0, 255);
-               if (a.scancode > 127) {
-                       a.scancode -= 0xe000;
-                       a.scancode += 128;
+       while (argv[1]) {
+               int sc = xstrtoul_range(argv[1], 16, 0, 0xe07f);
+               if (sc >= 0xe000) {
+                       sc -= 0xe000;
+                       sc += 0x0080;
                }
+               a.scancode = sc;
+               a.keycode = xatou_range(argv[2], 0, 255);
                ioctl_or_perror_and_die(fd, KDSETKEYCODE, &a,
                        "can't set SCANCODE %x to KEYCODE %d",
                        sc, a.keycode);
-               argc -= 2;
                argv += 2;
        }
        return EXIT_SUCCESS;