projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PArtial Changelog update. I'm still on vacation (I'm at a campground
[oweals/busybox.git]
/
console-tools
/
setkeycodes.c
diff --git
a/console-tools/setkeycodes.c
b/console-tools/setkeycodes.c
index 63c1063330fb70e1d2c1a70cb6760426b6be8d2c..c3c7e09aac2baa018f90687068c6fff47f9be755 100644
(file)
--- a/
console-tools/setkeycodes.c
+++ b/
console-tools/setkeycodes.c
@@
-22,18
+22,18
@@
*
*/
*
*/
-#include "busybox.h"
#include <stdio.h>
#include <stdlib.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include <stdio.h>
#include <stdlib.h>
#include <fcntl.h>
#include <sys/ioctl.h>
+#include "busybox.h"
/* From <linux/kd.h> */
struct kbkeycode {
unsigned int scancode, keycode;
};
/* From <linux/kd.h> */
struct kbkeycode {
unsigned int scancode, keycode;
};
-
#define KDSETKEYCODE 0x4B4D
/* write kernel keycode table entry */
+
static const int KDSETKEYCODE = 0x4B4D;
/* write kernel keycode table entry */
extern int
setkeycodes_main(int argc, char** argv)
extern int
setkeycodes_main(int argc, char** argv)
@@
-43,7
+43,7
@@
setkeycodes_main(int argc, char** argv)
struct kbkeycode a;
if (argc % 2 != 1 || argc < 2) {
struct kbkeycode a;
if (argc % 2 != 1 || argc < 2) {
-
usage(setkeycodes_usage
);
+
show_usage(
);
}
fd = get_console_fd("/dev/console");
}
fd = get_console_fd("/dev/console");
@@
-52,21
+52,21
@@
setkeycodes_main(int argc, char** argv)
a.keycode = atoi(argv[2]);
a.scancode = sc = strtol(argv[1], &ep, 16);
if (*ep) {
a.keycode = atoi(argv[2]);
a.scancode = sc = strtol(argv[1], &ep, 16);
if (*ep) {
-
fatalError("error reading SCANCODE: '%s'\n
", argv[1]);
+
error_msg_and_die("error reading SCANCODE: '%s'
", argv[1]);
}
if (a.scancode > 127) {
a.scancode -= 0xe000;
a.scancode += 128;
}
if (a.scancode > 255 || a.keycode > 127) {
}
if (a.scancode > 127) {
a.scancode -= 0xe000;
a.scancode += 128;
}
if (a.scancode > 255 || a.keycode > 127) {
-
fatalError("SCANCODE or KEYCODE outside bounds\n
");
+
error_msg_and_die("SCANCODE or KEYCODE outside bounds
");
}
if (ioctl(fd,KDSETKEYCODE,&a)) {
perror("KDSETKEYCODE");
}
if (ioctl(fd,KDSETKEYCODE,&a)) {
perror("KDSETKEYCODE");
-
fatalError("failed to set SCANCODE %x to KEYCODE %d\n
", sc, a.keycode);
+
error_msg_and_die("failed to set SCANCODE %x to KEYCODE %d
", sc, a.keycode);
}
argc -= 2;
argv += 2;
}
}
argc -= 2;
argv += 2;
}
-
return( TRUE)
;
+
return EXIT_SUCCESS
;
}
}