summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2013-09-19 15:56:59 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2013-09-19 15:56:59 (GMT)
commit054f3eb7848230702b149a7e17f05314cb0157cb (patch)
tree7a1faa5572b55b4777a58919f6f255b494319021
parenta6ed6a31484243e684a51d4cb3114f17f44c3233 (diff)
downloadbusybox-054f3eb7848230702b149a7e17f05314cb0157cb.tar.gz
busybox-054f3eb7848230702b149a7e17f05314cb0157cb.tar.bz2
loadkmap: explain what happens with K_ALLOCATED key value
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--console-tools/loadkmap.c27
1 files changed, 19 insertions, 8 deletions
diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c
index bcffe16..66ec3b0 100644
--- a/console-tools/loadkmap.c
+++ b/console-tools/loadkmap.c
@@ -48,6 +48,7 @@ int loadkmap_main(int argc UNUSED_PARAM, char **argv)
if (argv[1])
bb_show_usage();
/* bb_warn_ignoring_args(argv[1]); */
+
fd = get_console_fd_or_die();
/* or maybe:
opt = getopt32(argv, "C:", &tty_name);
@@ -61,14 +62,24 @@ int loadkmap_main(int argc UNUSED_PARAM, char **argv)
xread(STDIN_FILENO, flags, MAX_NR_KEYMAPS);
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);
}
}