emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

setkeycodes: make it NOEXEC, better --help text

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-08-06 18:29:25 +02:00
parent 341ce0a31e
commit b83db4ddae
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NOFORK_NOEXEC.lst
View File

@ -307,7 +307,7 @@ seq - noexec. runner
setarch - noexec. spawner setarch - noexec. spawner
setconsole setconsole
setfont setfont
setkeycodes setkeycodes - noexec
setlogcons - noexec setlogcons - noexec
setpriv - spawner, changes state, let's play safe and not be noexec setpriv - spawner, changes state, let's play safe and not be noexec
setserial - noexec setserial - noexec

15
console-tools/setkeycodes.c
View File

@ -16,17 +16,16 @@
//config: This program loads entries into the kernel's scancode-to-keycode //config: This program loads entries into the kernel's scancode-to-keycode
//config: map, allowing unusual keyboards to generate usable keycodes. //config: map, allowing unusual keyboards to generate usable keycodes.
//applet:IF_SETKEYCODES(APPLET(setkeycodes, BB_DIR_USR_BIN, BB_SUID_DROP)) //applet:IF_SETKEYCODES(APPLET_NOEXEC(setkeycodes, setkeycodes, BB_DIR_USR_BIN, BB_SUID_DROP, setkeycodes))
//kbuild:lib-$(CONFIG_SETKEYCODES) += setkeycodes.o //kbuild:lib-$(CONFIG_SETKEYCODES) += setkeycodes.o
//usage:#define setkeycodes_trivial_usage //usage:#define setkeycodes_trivial_usage
//usage: "SCANCODE KEYCODE..." //usage: "{ SCANCODE KEYCODE }..."
//usage:#define setkeycodes_full_usage "\n\n" //usage:#define setkeycodes_full_usage "\n\n"
//usage: "Set entries into the kernel's scancode-to-keycode map,\n" //usage: "Modify kernel's scancode-to-keycode map,\n"
//usage: "allowing unusual keyboards to generate usable keycodes.\n\n" //usage: "allowing unusual keyboards to generate usable keycodes.\n\n"
//usage: "SCANCODE may be either xx or e0xx (hexadecimal),\n" //usage: "SCANCODE is either xx or e0xx (hexadecimal), KEYCODE is decimal."
//usage: "and KEYCODE is given in decimal."
//usage: //usage:
//usage:#define setkeycodes_example_usage //usage:#define setkeycodes_example_usage
//usage: "$ setkeycodes e030 127\n" //usage: "$ setkeycodes e030 127\n"
@ -45,7 +44,6 @@ int setkeycodes_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int setkeycodes_main(int argc, char **argv) int setkeycodes_main(int argc, char **argv)
{ {
int fd; int fd;
struct kbkeycode a;
if (!(argc & 1) /* if even */ || argc < 2) { if (!(argc & 1) /* if even */ || argc < 2) {
bb_show_usage(); bb_show_usage();
@ -54,7 +52,10 @@ int setkeycodes_main(int argc, char **argv)
fd = get_console_fd_or_die(); fd = get_console_fd_or_die();
while (argv[1]) { while (argv[1]) {
int sc = xstrtoul_range(argv[1], 16, 0, 0xe07f); struct kbkeycode a;
int sc;
sc = xstrtoul_range(argv[1], 16, 0, 0xe07f);
if (sc >= 0xe000) { if (sc >= 0xe000) {
sc -= 0xe000; sc -= 0xe000;
sc += 0x0080; sc += 0x0080;