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

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/dumpkmap.c (modified) (4 diffs)
• mindi-busybox/console-tools/loadkmap.c (modified) (4 diffs)
• mindi-busybox/console-tools/resize.c (modified) (2 diffs)
• mindi-busybox/console-tools/setlogcons.c (modified) (1 diff)
• mindi-busybox/console-tools/showkey.c (modified) (1 diff)

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

@@ -19 +19 @@
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 /* From <linux/kd.h> */
@@ -37 +38 @@
     struct kbentry ke;
     int i, j, fd;
-    RESERVE_CONFIG_BUFFER(flags, MAX_NR_KEYMAPS);
+#define flags bb_common_bufsiz1
+    setup_common_bufsiz();
 
     /* When user accidentally runs "dumpkmap FILE"
      * instead of "dumpkmap >FILE", we'd dump binary stuff to tty.
-     * Let's prevent it: */
+     * Let's prevent it:
+     */
     if (argv[1])
         bb_show_usage();
@@ -48 +51 @@
     fd = get_console_fd_or_die();
 
+#if 0
     write(STDOUT_FILENO, "bkeymap", 7);
-
     /* Here we want to set everything to 0 except for indexes:
-     * [0-2] [4-6] [8-10] [12] */
-    memset(flags, 0x00, MAX_NR_KEYMAPS);
+     * [0-2] [4-6] [8-10] [12]
+     */
+    /*memset(flags, 0x00, MAX_NR_KEYMAPS); - already is */
     memset(flags, 0x01, 13);
     flags[3] = flags[7] = flags[11] = 0;
-
     /* dump flags */
     write(STDOUT_FILENO, flags, MAX_NR_KEYMAPS);
+#define flags7 flags
+#else
+    /* Same effect */
+    /*                     0 1 2 3 4 5 6 7 8 9 a b c=12 */
+    memcpy(flags, "bkeymap\1\1\1\0\1\1\1\0\1\1\1\0\1",
+    /* Can use sizeof, or sizeof-1. sizeof is even, using that */
+    /****/ sizeof("bkeymap\1\1\1\0\1\1\1\0\1\1\1\0\1")
+    );
+    write(STDOUT_FILENO, flags, 7 + MAX_NR_KEYMAPS);
+#define flags7 (flags + 7)
+#endif
 
-    for (i = 0; i < MAX_NR_KEYMAPS; i++) {
-        if (flags[i] == 1) {
+    for (i = 0; i < 13; i++) {
+        if (flags7[i]) {
             for (j = 0; j < NR_KEYS; j++) {
                 ke.kb_index = j;
                 ke.kb_table = i;
                 if (!ioctl_or_perror(fd, KDGKBENT, &ke,
-                        "ioctl failed with %s, %s, %p",
-                        (char *)&ke.kb_index,
-                        (char *)&ke.kb_table,
-                        &ke.kb_value)
+                        "ioctl(KDGKBENT{%d,%d}) failed",
+                        j, i)
                 ) {
-                    write(STDOUT_FILENO, (void*)&ke.kb_value, 2);
+                    write(STDOUT_FILENO, &ke.kb_value, 2);
                 }
             }
@@ -77 +89 @@
     if (ENABLE_FEATURE_CLEAN_UP) {
         close(fd);
-        RELEASE_CONFIG_BUFFER(flags);
     }
     return EXIT_SUCCESS;

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);
         }
     }

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

@@ -15 +15 @@
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 #define ESC "\033"
 
-#define old_termios_p ((struct termios*)&bb_common_bufsiz1)
+#define old_termios_p ((struct termios*)bb_common_bufsiz1)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 static void
@@ -33 +35 @@
     struct winsize w = { 0, 0, 0, 0 };
     int ret;
+
+    INIT_G();
 
     /* We use _stderr_ in order to make resize usable

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

@@ -11 +11 @@
 
 //usage:#define setlogcons_trivial_usage
-//usage:       "N"
+//usage:       "[N]"
 //usage:#define setlogcons_full_usage "\n\n"
-//usage:       "Redirect the kernel output to console N (0 for current)"
+//usage:       "Redirect the kernel output to console N. Default:0 (current console)"
 
 #include "libbb.h"

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

@@ -84 +84 @@
                 break;
         }
-
     } else {
         // we assume a PC keyboard