Re-wordwrap the new tests, and fix seq.c to pass them.

[oweals/busybox.git] / console-tools / setkeycodes.c

diff --git a/console-tools/setkeycodes.c b/console-tools/setkeycodes.c
index 63c1063330fb70e1d2c1a70cb6760426b6be8d2c..dacf37b12938ba5d5756cadccc95fdac5b4fae31 100644 (file)
--- 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,20 +22,22 @@
  *
  */
 
-#include "busybox.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 */
+enum {
+       KDSETKEYCODE = 0x4B4D  /* write kernel keycode table entry */
+};
 
-extern int 
+extern int
 setkeycodes_main(int argc, char** argv)
 {
     char *ep;
@@ -43,30 +45,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;
 }