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

diff --git a/console-tools/setkeycodes.c b/console-tools/setkeycodes.c
index c3c7e09aa..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
@@ -35,7 +35,7 @@ struct kbkeycode {
 };
 static const int KDSETKEYCODE = 0x4B4D;  /* write kernel keycode table entry */
 
-extern int 
+extern int
 setkeycodes_main(int argc, char** argv)
 {
     char *ep;
@@ -43,27 +43,27 @@ setkeycodes_main(int argc, char** argv)
     struct kbkeycode a;
 
     if (argc % 2 != 1 || argc < 2) {
-      show_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) {
-      error_msg_and_die("error reading SCANCODE: '%s'", 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) {
-      error_msg_and_die("SCANCODE or KEYCODE outside bounds");
+      bb_error_msg_and_die("SCANCODE or KEYCODE outside bounds");
 	}
 	if (ioctl(fd,KDSETKEYCODE,&a)) {
 	    perror("KDSETKEYCODE");
-		error_msg_and_die("failed to set SCANCODE %x to KEYCODE %d", sc, a.keycode);
+		bb_error_msg_and_die("failed to set SCANCODE %x to KEYCODE %d", sc, a.keycode);
 	}
 	argc -= 2;
 	argv += 2;