X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=console-tools%2Fsetkeycodes.c;h=169d0bb0af1e1a5e342555c2c662d71625f4529e;hb=d1b6078e5d614993de2a858e85f1dc06cfe5539b;hp=1bdb909ea7de5af68204fd1c920237f65d950280;hpb=bd22ed806782eec76929bcd2ec556717e79d24c7;p=oweals%2Fbusybox.git

diff --git a/console-tools/setkeycodes.c b/console-tools/setkeycodes.c
index 1bdb909ea..169d0bb0a 100644
--- a/console-tools/setkeycodes.c
+++ b/console-tools/setkeycodes.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 1994-1998 Andries E. Brouwer <aeb@cwi.nl>
  *
- * Adjusted for BusyBox by Erik Andersen <andersee@debian.org>
+ * 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
@@ -22,31 +22,20 @@
  *
  */
 
-#include "internal.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;
 };
-#define KDSETKEYCODE    0x4B4D  /* write kernel keycode table entry */
+static const int KDSETKEYCODE = 0x4B4D;  /* write kernel keycode table entry */
 
-
-static const char setkeycodes_usage[] =
-	"setkeycodes SCANCODE KEYCODE ...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nSet entries into the kernel's scancode-to-keycode map,\n"
-	"allowing unusual keyboards to generate usable keycodes.\n\n" 
-	"SCANCODE may be either xx or e0xx (hexadecimal),\n"
-	"and KEYCODE is given in decimal\n"
-#endif
-	;
-
-extern int 
+extern int
 setkeycodes_main(int argc, char** argv)
 {
     char *ep;
@@ -54,30 +43,30 @@ setkeycodes_main(int argc, char** argv)
     struct kbkeycode a;
 
     if (argc % 2 != 1 || argc < 2) {
-      usage(setkeycodes_usage);
+      bb_show_usage();
 	}
-	 
-	fd = get_console_fd("/dev/console");
+	
+	fd = get_console_fd();
 
     while (argc > 2) {
 	a.keycode = atoi(argv[2]);
 	a.scancode = sc = strtol(argv[1], &ep, 16);
 	if (*ep) {
-      fatalError("error reading SCANCODE: '%s'\n", argv[1]);
+      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) {
-      fatalError("SCANCODE or KEYCODE outside bounds\n");
+      bb_error_msg_and_die("SCANCODE or KEYCODE outside bounds");
 	}
 	if (ioctl(fd,KDSETKEYCODE,&a)) {
 	    perror("KDSETKEYCODE");
-		fatalError("failed to set SCANCODE %x to KEYCODE %d\n", sc, a.keycode);
+		bb_error_msg_and_die("failed to set SCANCODE %x to KEYCODE %d", sc, a.keycode);
 	}
 	argc -= 2;
 	argv += 2;
     }
-    return( TRUE);
+	return EXIT_SUCCESS;
 }