Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/console-tools/loadkmap.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/console-tools/loadkmap.c (modified) (4 diffs)

branches/3.3/mindi-busybox/console-tools/loadkmap.c

@@ -11 +11 @@
 //usage:       "< keymap"
 //usage:#define loadkmap_full_usage "\n\n"
-//usage:       "Load a binary keyboard translation table from stdin\n"
-/* //usage:     "\n -C TTY  Affect TTY instead of /dev/tty" */
+//usage:       "Load a binary keyboard translation table from stdin"
+////usage:       "\n"
+////usage:       "\n    -C TTY  Affect TTY instead of /dev/tty"
 //usage:
 //usage:#define loadkmap_example_usage
@@ -49 +50 @@
         bb_show_usage();
 /* bb_warn_ignoring_args(argv[1]); */
+
     fd = get_console_fd_or_die();
 /* or maybe:
@@ -56 +58 @@
 
     xread(STDIN_FILENO, flags, 7);
-    if (strncmp(flags, BINARY_KEYMAP_MAGIC, 7))
+    if (!is_prefixed_with(flags, BINARY_KEYMAP_MAGIC))
         bb_error_msg_and_die("not a valid binary keymap");
 
@@ -62 +64 @@
 
     for (i = 0; i < MAX_NR_KEYMAPS; i++) {
-        if (flags[i] == 1) {
-            xread(STDIN_FILENO, ibuff, NR_KEYS * sizeof(uint16_t));
-            for (j = 0; j < NR_KEYS; j++) {
-                ke.kb_index = j;
-                ke.kb_table = i;
-                ke.kb_value = ibuff[j];
-                ioctl(fd, KDSKBENT, &ke);
-            }
+        if (flags[i] != 1)
+            continue;
+        xread(STDIN_FILENO, ibuff, NR_KEYS * sizeof(uint16_t));
+        for (j = 0; j < NR_KEYS; j++) {
+            ke.kb_index = j;
+            ke.kb_table = i;
+            ke.kb_value = ibuff[j];
+            /*
+             * Note: table[idx:0] can contain special value
+             * K_ALLOCATED (marks allocated tables in kernel).
+             * dumpkmap saves the value as-is; but attempts
+             * to load it here fail, since it isn't a valid
+             * key value: it is K(KT_SPEC,126) == 2<<8 + 126,
+             * whereas last valid KT_SPEC is
+             * K_BARENUMLOCK == K(KT_SPEC,19).
+             * So far we just ignore these errors:
+             */
+            ioctl(fd, KDSKBENT, &ke);
         }
     }