From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sun, 6 Aug 2017 10:23:04 +0000 (+0200)
Subject: kbd_more: make it NOEXEC, remove redundant opt clearing
X-Git-Tag: 1_28_0~215
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ae17ba0924c9c0020a6455020e7841a12bd738d4;p=oweals%2Fbusybox.git

kbd_more: make it NOEXEC, remove redundant opt clearing

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/console-tools/kbd_mode.c b/console-tools/kbd_mode.c
index b0b594614..f16449dcd 100644
--- a/console-tools/kbd_mode.c
+++ b/console-tools/kbd_mode.c
@@ -15,7 +15,7 @@
 //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
 
@@ -27,7 +27,7 @@
 //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>
@@ -84,7 +84,6 @@ int kbd_mode_main(int argc UNUSED_PARAM, char **argv)
 		 * #define K_OFF           0x04
 		 * (looks like "-ak" together would cause the same effect as -u)
 		 */
-		opt &= 0xf; /* clear -C bit */
 		opt = opt & UNICODE ? 3 : opt >> 1;
 		/* double cast prevents warnings about widening conversion */
 		xioctl(fd, KDSKBMODE, (void*)(ptrdiff_t)opt);