aboutsummaryrefslogtreecommitdiff
path: root/console-tools/setkeycodes.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-08-05 23:32:27 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-08-05 23:32:27 +0000
commit2afd5ab62ca5f2438a3953f37e738f73553595da (patch)
treef6406254bd52e449ac58851e370774ed29e449c2 /console-tools/setkeycodes.c
parente0143a1aad60e9141245034379469477006dba81 (diff)
downloadbusybox-w32-2afd5ab62ca5f2438a3953f37e738f73553595da.tar.gz
busybox-w32-2afd5ab62ca5f2438a3953f37e738f73553595da.tar.bz2
busybox-w32-2afd5ab62ca5f2438a3953f37e738f73553595da.zip
*: use get_console_fd() as appropriate, and make it fail on open error -
get_console_fd_or_die(). function old new delta get_console_fd_or_die - 163 +163 loadkmap_main 211 201 -10 loadfont_main 440 430 -10 dumpkmap_main 218 208 -10 kbd_mode_main 158 146 -12 setkeycodes_main 156 143 -13 get_console_fd 163 - -163 ------------------------------------------------------------------------------ (add/remove: 1/1 grow/shrink: 0/5 up/down: 163/-218) Total: -55 bytes
Diffstat (limited to 'console-tools/setkeycodes.c')
-rw-r--r--console-tools/setkeycodes.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/console-tools/setkeycodes.c b/console-tools/setkeycodes.c
index e9a050862..597272a2f 100644
--- a/console-tools/setkeycodes.c
+++ b/console-tools/setkeycodes.c
@@ -26,11 +26,11 @@ int setkeycodes_main(int argc, char **argv)
26 int fd, sc; 26 int fd, sc;
27 struct kbkeycode a; 27 struct kbkeycode a;
28 28
29 if (argc % 2 != 1 || argc < 2) { 29 if (!(argc & 1) /* if even */ || argc < 2) {
30 bb_show_usage(); 30 bb_show_usage();
31 } 31 }
32 32
33 fd = get_console_fd(); 33 fd = get_console_fd_or_die();
34 34
35 while (argc > 2) { 35 while (argc > 2) {
36 a.keycode = xatou_range(argv[2], 0, 127); 36 a.keycode = xatou_range(argv[2], 0, 127);
@@ -40,7 +40,7 @@ int setkeycodes_main(int argc, char **argv)
40 a.scancode += 128; 40 a.scancode += 128;
41 } 41 }
42 ioctl_or_perror_and_die(fd, KDSETKEYCODE, &a, 42 ioctl_or_perror_and_die(fd, KDSETKEYCODE, &a,
43 "failed to set SCANCODE %x to KEYCODE %d", 43 "can't set SCANCODE %x to KEYCODE %d",
44 sc, a.keycode); 44 sc, a.keycode);
45 argc -= 2; 45 argc -= 2;
46 argv += 2; 46 argv += 2;