ash: in tryexec(), ensure we don't try to run embedded scripts as applets

[oweals/busybox.git] / console-tools / kbd_mode.c

diff --git a/console-tools/kbd_mode.c b/console-tools/kbd_mode.c
index da31af28d33cde71bf6b49eadc104ad1224ed3ce..f16449dcdd33853c819ebb840c0b2c0fe3df7495 100644 (file)
--- a/console-tools/kbd_mode.c
+++ b/console-tools/kbd_mode.c
@@ -15,19 +15,19 @@
 //config:      help
 //config:      This program reports and sets keyboard mode.
 
-//applet:IF_KBD_MODE(APPLET(kbd_mode, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_KBD_MODE(APPLET_NOEXEC(kbd_mode, kbd_mode, BB_DIR_BIN, BB_SUID_DROP, kbd_mode))
 
 //kbuild:lib-$(CONFIG_KBD_MODE) += kbd_mode.o
 
 //usage:#define kbd_mode_trivial_usage
 //usage:       "[-a|k|s|u] [-C TTY]"
 //usage:#define kbd_mode_full_usage "\n\n"
-//usage:       "Report or set the keyboard mode\n"
+//usage:       "Report or set VT console keyboard mode\n"
 //usage:     "\n       -a      Default (ASCII)"
 //usage:     "\n       -k      Medium-raw (keycode)"
 //usage:     "\n       -s      Raw (scancode)"
 //usage:     "\n       -u      Unicode (utf-8)"
-//usage:     "\n       -C TTY  Affect TTY instead of /dev/tty"
+//usage:     "\n       -C TTY  Affect TTY"
 
 #include "libbb.h"
 #include <linux/kd.h>
@@ -43,15 +43,20 @@ int kbd_mode_main(int argc UNUSED_PARAM, char **argv)
        };
        int fd;
        unsigned opt;
-//TODO? kbd-2.0.3 without -C tries in sequence:
-//fd#0, /dev/tty, /dev/tty0.
-//Also, it checks KDGKBTYPE before doing KDGKBMODE
-//maybe we can use get_console_fd_or_die()?
-       const char *tty_name = CURRENT_TTY;
+       const char *tty_name;
 
        opt = getopt32(argv, "sakuC:", &tty_name);
-       fd = xopen_nonblocking(tty_name);
-       opt &= 0xf; /* clear -C bit, see (*) */
+       if (opt & 0x10) {
+               opt &= 0xf; /* clear -C bit, see (*) */
+               fd = xopen_nonblocking(tty_name);
+       } else {
+               /* kbd-2.0.3 tries in sequence:
+                * fd#0, /dev/tty, /dev/tty0.
+                * get_console_fd_or_die: /dev/console, /dev/tty0, /dev/tty.
+                * kbd-2.0.3 checks KDGKBTYPE, get_console_fd_or_die checks too.
+                */
+               fd = get_console_fd_or_die();
+       }
 
        if (!opt) { /* print current setting */
                const char *mode = "unknown";