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 d825257869a39a6e4cb70fac347086318d01c82c..ca8cd21c2a92c66360fbc2d03866ae830d23e99d 100644 (file)
--- a/console-tools/setkeycodes.c
+++ b/console-tools/setkeycodes.c
@@ -6,47 +6,41 @@
  *
  * 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 <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include "busybox.h"
-
+#include "libbb.h"
 
 /* From <linux/kd.h> */
 struct kbkeycode {
-       unsigned int scancode, keycode;
+       unsigned scancode, keycode;
 };
 enum {
        KDSETKEYCODE = 0x4B4D  /* write kernel keycode table entry */
 };
 
-extern int
-setkeycodes_main(int argc, char** argv)
+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 % 2 != 1 || argc < 2) {
+       if (!(argc & 1) /* if even */ || argc < 2) {
                bb_show_usage();
        }
 
-       fd = get_console_fd();
+       fd = get_console_fd_or_die();
 
-       while (argc > 2) {
-               a.keycode = xatoul_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;
-               }
-               if (ioctl(fd, KDSETKEYCODE, &a)) {
-                       bb_perror_msg_and_die("failed to set SCANCODE %x to KEYCODE %d", sc, a.keycode);
+       while (argv[1]) {
+               int sc = xstrtoul_range(argv[1], 16, 0, 0xe07f);
+               if (sc >= 0xe000) {
+                       sc -= 0xe000;
+                       sc += 0x0080;
                }
-               argc -= 2;
+               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);
                argv += 2;
        }
        return EXIT_SUCCESS;