Merge commit '19311bfa7b8e8c6effa9c375de9b0eb4338bee12' into merge

Conflicts:
	coreutils/ls.c
	shell/ash.c

3 files changed, 38 insertions, 29 deletions

diff --git a/console-tools/Config.src b/console-tools/Config.src
index cdb26800e..c65704478 100644
--- a/console-tools/Config.src
+++ b/console-tools/Config.src
@@ -10,7 +10,7 @@ INSERT
 config CHVT
         bool "chvt"
         default y
-        depends on PLATFORM_LINUX
+        select PLATFORM_LINUX
         help
           This program is used to change to another terminal.
           Example: chvt 4 (change to terminal /dev/tty4)
@@ -18,7 +18,7 @@ config CHVT
 config FGCONSOLE
         bool "fgconsole"
         default y
-        depends on PLATFORM_LINUX
+        select PLATFORM_LINUX
         help
           This program prints active (foreground) console number.
 
@@ -31,14 +31,14 @@ config CLEAR
 config DEALLOCVT
         bool "deallocvt"
         default y
-        depends on PLATFORM_LINUX
+        select PLATFORM_LINUX
         help
           This program deallocates unused virtual consoles.
 
 config DUMPKMAP
         bool "dumpkmap"
         default y
-        depends on PLATFORM_LINUX
+        select PLATFORM_LINUX
         help
           This program dumps the kernel's keyboard translation table to
           stdout, in binary format. You can then use loadkmap to load it.
@@ -46,21 +46,21 @@ config DUMPKMAP
 config KBD_MODE
         bool "kbd_mode"
         default y
-        depends on PLATFORM_LINUX
+        select PLATFORM_LINUX
         help
           This program reports and sets keyboard mode.
 
 config LOADFONT
         bool "loadfont"
         default y
-        depends on PLATFORM_LINUX
+        select PLATFORM_LINUX
         help
           This program loads a console font from standard input.
 
 config LOADKMAP
         bool "loadkmap"
         default y
-        depends on PLATFORM_LINUX
+        select PLATFORM_LINUX
         help
           This program loads a keyboard translation table from
           standard input.
@@ -68,7 +68,7 @@ config LOADKMAP
 config OPENVT
         bool "openvt"
         default y
-        depends on PLATFORM_LINUX
+        select PLATFORM_LINUX
         help
           This program is used to start a command on an unused
           virtual terminal.
@@ -100,7 +100,7 @@ config FEATURE_RESIZE_PRINT
 config SETCONSOLE
         bool "setconsole"
         default y
-        depends on PLATFORM_LINUX
+        select PLATFORM_LINUX
         help
           This program redirects the system console to another device,
           like the current tty while logged in via telnet.
@@ -115,7 +115,7 @@ config FEATURE_SETCONSOLE_LONG_OPTIONS
 config SETFONT
         bool "setfont"
         default y
-        depends on PLATFORM_LINUX
+        select PLATFORM_LINUX
         help
           Allows to load console screen map. Useful for i18n.
 
@@ -137,7 +137,7 @@ config DEFAULT_SETFONT_DIR
 config SETKEYCODES
         bool "setkeycodes"
         default y
-        depends on PLATFORM_LINUX
+        select PLATFORM_LINUX
         help
           This program loads entries into the kernel's scancode-to-keycode
           map, allowing unusual keyboards to generate usable keycodes.
@@ -145,14 +145,14 @@ config SETKEYCODES
 config SETLOGCONS
         bool "setlogcons"
         default y
-        depends on PLATFORM_LINUX
+        select PLATFORM_LINUX
         help
           This program redirects the output console of kernel messages.
 
 config SHOWKEY
         bool "showkey"
         default y
-        depends on PLATFORM_LINUX
+        select PLATFORM_LINUX
         help
           Shows keys pressed.
 
diff --git a/console-tools/openvt.c b/console-tools/openvt.c
index 6e0b589a0..56f50c6cd 100644
--- a/console-tools/openvt.c
+++ b/console-tools/openvt.c
@@ -144,9 +144,7 @@ int openvt_main(int argc UNUSED_PARAM, char **argv)
 
         if (!argv[0]) {
                 argv--;
-                argv[0] = getenv("SHELL");
-                if (!argv[0])
-                        argv[0] = (char *) DEFAULT_SHELL;
+                argv[0] = (char *) get_shell_name();
                 /*argv[1] = NULL; - already is */
         }
 
diff --git a/console-tools/showkey.c b/console-tools/showkey.c
index e7834f702..06df68bfd 100644
--- a/console-tools/showkey.c
+++ b/console-tools/showkey.c
@@ -56,37 +56,45 @@ int showkey_main(int argc UNUSED_PARAM, char **argv)
         // FIXME: aks are all mutually exclusive
         getopt32(argv, "aks");
 
-        // get keyboard settings
-        xioctl(STDIN_FILENO, KDGKBMODE, &kbmode);
-        printf("kb mode was %s\n\nPress any keys. Program terminates %s\n\n",
-                kbmode == K_RAW ? "RAW" :
-                        (kbmode == K_XLATE ? "XLATE" :
-                                (kbmode == K_MEDIUMRAW ? "MEDIUMRAW" :
-                                        (kbmode == K_UNICODE ? "UNICODE" : "UNKNOWN")))
-                , (option_mask32 & OPT_a) ? "on EOF (ctrl-D)" : "10s after last keypress"
-        );
-
         // prepare for raw mode
         xget1(&tio, &tio0);
         // put stdin in raw mode
         xset1(&tio);
 
+#define press_keys "Press any keys, program terminates %s:\r\n\n"
+
         if (option_mask32 & OPT_a) {
+                // just read stdin char by char
                 unsigned char c;
 
-                // just read stdin char by char
+                printf(press_keys, "on EOF (ctrl-D)");
+
+                // read and show byte values
                 while (1 == read(STDIN_FILENO, &c, 1)) {
                         printf("%3u 0%03o 0x%02x\r\n", c, c, c);
                         if (04 /*CTRL-D*/ == c)
                                 break;
                 }
+
         } else {
+                // we assume a PC keyboard
+                xioctl(STDIN_FILENO, KDGKBMODE, &kbmode);
+                printf("Keyboard mode was %s.\r\n\n",
+                        kbmode == K_RAW ? "RAW" :
+                                (kbmode == K_XLATE ? "XLATE" :
+                                        (kbmode == K_MEDIUMRAW ? "MEDIUMRAW" :
+                                                (kbmode == K_UNICODE ? "UNICODE" : "UNKNOWN")))
+                );
+
                 // set raw keyboard mode
                 xioctl(STDIN_FILENO, KDSKBMODE, (void *)(ptrdiff_t)((option_mask32 & OPT_k) ? K_MEDIUMRAW : K_RAW));
 
                 // we should exit on any signal; signals should interrupt read
                 bb_signals_recursive_norestart(BB_FATAL_SIGS, record_signo);
 
+                // inform user that program ends after time of inactivity
+                printf(press_keys, "10s after last keypress");
+
                 // read and show scancodes
                 while (!bb_got_signal) {
                         char buf[18];
@@ -94,6 +102,7 @@ int showkey_main(int argc UNUSED_PARAM, char **argv)
 
                         // setup 10s watchdog
                         alarm(10);
+
                         // read scancodes
                         n = read(STDIN_FILENO, buf, sizeof(buf));
                         i = 0;
@@ -121,11 +130,13 @@ int showkey_main(int argc UNUSED_PARAM, char **argv)
                         }
                         puts("\r");
                 }
+
+                // restore keyboard mode
+                xioctl(STDIN_FILENO, KDSKBMODE, (void *)(ptrdiff_t)kbmode);
         }
 
-        // restore keyboard and console settings
+        // restore console settings
         xset1(&tio0);
-        xioctl(STDIN_FILENO, KDSKBMODE, (void *)(ptrdiff_t)kbmode);
 
         return EXIT_SUCCESS;
 }