Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/console-tools/setkeycodes.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/console-tools/setkeycodes.c (modified) (2 diffs)

branches/2.2.9/mindi-busybox/console-tools/setkeycodes.c

@@ -7 +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 <sys/ioctl.h>
 #include "libbb.h"
 
 /* From <linux/kd.h> */
 struct kbkeycode {
-    unsigned int scancode, keycode;
+    unsigned scancode, keycode;
 };
 enum {
@@ -21 +19 @@
 };
 
-int setkeycodes_main(int argc, char** argv);
-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;
+    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,
-            "failed to set SCANCODE %x to KEYCODE %d",
+            "can't set SCANCODE %x to KEYCODE %d",
             sc, a.keycode);
-        argc -= 2;
         argv += 2;
     }