X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=console-tools%2Fsetkeycodes.c;h=ba3d2e44e6804619f6d270f10162c7a08ae390ed;hb=482f2b31e788fdd849f78a3aa91cf6102fc98892;hp=dacf37b12938ba5d5756cadccc95fdac5b4fae31;hpb=bc68cd14ccaebc17e7e03a08e51fddfb91007624;p=oweals%2Fbusybox.git

diff --git a/console-tools/setkeycodes.c b/console-tools/setkeycodes.c
index dacf37b12..ba3d2e44e 100644
--- a/console-tools/setkeycodes.c
+++ b/console-tools/setkeycodes.c
@@ -6,28 +6,11 @@
  *
  * Adjusted for BusyBox by Erik Andersen <andersen@codepoet.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include "busybox.h"
-
+//#include <sys/ioctl.h>
+#include "libbb.h"
 
 /* From <linux/kd.h> */
 struct kbkeycode {
@@ -37,38 +20,30 @@ enum {
 	KDSETKEYCODE = 0x4B4D  /* write kernel keycode table entry */
 };
 
-extern int
-setkeycodes_main(int argc, char** argv)
+int setkeycodes_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int setkeycodes_main(int argc, char **argv)
 {
-    char *ep;
-    int fd, sc;
-    struct kbkeycode a;
+	int fd, sc;
+	struct kbkeycode a;
 
-    if (argc % 2 != 1 || argc < 2) {
-      bb_show_usage();
+	if (argc % 2 != 1 || argc < 2) {
+		bb_show_usage();
 	}
 
 	fd = get_console_fd();
 
-    while (argc > 2) {
-	a.keycode = atoi(argv[2]);
-	a.scancode = sc = strtol(argv[1], &ep, 16);
-	if (*ep) {
-      bb_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) {
-      bb_error_msg_and_die("SCANCODE or KEYCODE outside bounds");
-	}
-	if (ioctl(fd,KDSETKEYCODE,&a)) {
-	    perror("KDSETKEYCODE");
-		bb_error_msg_and_die("failed to set SCANCODE %x to KEYCODE %d", sc, a.keycode);
+	while (argc > 2) {
+		a.keycode = xatoul_range(argv[2], 0, 127);
+		a.scancode = sc = xstrtoul_range(argv[1], 16, 0, 255);
+		if (a.scancode > 127) {
+			a.scancode -= 0xe000;
+			a.scancode += 128;
+		}
+		ioctl_or_perror_and_die(fd, KDSETKEYCODE, &a,
+			"failed to set SCANCODE %x to KEYCODE %d",
+			sc, a.keycode);
+		argc -= 2;
+		argv += 2;
 	}
-	argc -= 2;
-	argv += 2;
-    }
 	return EXIT_SUCCESS;
 }