No longer needed

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

diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c
index 905741467cc33e7371ceb8dffdcc7736b8eec7e3..849d747a698d3a456b973913886a01be4341a22d 100644 (file)
--- a/console-tools/loadkmap.c
+++ b/console-tools/loadkmap.c
@@ -20,69 +20,52 @@
  *
  */
 
-#include "internal.h"
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
-#include <linux/kd.h>
-#include <linux/keyboard.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
 #include <sys/ioctl.h>
+#include "busybox.h"
 
+#define BINARY_KEYMAP_MAGIC "bkeymap"
 
-static const char loadkmap_usage[] = "loadkmap\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-       "Loads a binary keyboard translation table from standard input.\n"
-#endif
-       ;
+/* From <linux/kd.h> */
+struct kbentry {
+       unsigned char kb_table;
+       unsigned char kb_index;
+       unsigned short kb_value;
+};
+/* sets one entry in translation table */
+#define KDSKBENT        0x4B47
 
+/* From <linux/keyboard.h> */
+#define NR_KEYS         128
+#define MAX_NR_KEYMAPS  256
 
 int loadkmap_main(int argc, char **argv)
 {
        struct kbentry ke;
-       u_short *ibuff;
-       int i, j, fd, readsz, pos, ibuffsz = NR_KEYS * sizeof(u_short);
-       char flags[MAX_NR_KEYMAPS], magic[] = "bkeymap", buff[7];
+       int i, j, fd;
+       u_short ibuff[NR_KEYS];
+       char flags[MAX_NR_KEYMAPS];
+       char buff[7];
 
-       if (argc>=2 && *argv[1]=='-') {
-               usage(loadkmap_usage);
-       }
-
-       fd = open("/dev/tty0", O_RDWR);
-       if (fd < 0) {
-               fprintf(stderr, "Error opening /dev/tty0: %s\n", strerror(errno));
-               exit(FALSE);
-       }
+       if (argc != 1)
+               bb_show_usage();
 
-       read(0, buff, 7);
-       if (0 != strncmp(buff, magic, 7)) {
-               fprintf(stderr, "This is not a valid binary keymap.\n");
-               exit(FALSE);
-       }
+       fd = bb_xopen(CURRENT_VC, O_RDWR);
 
-       if (MAX_NR_KEYMAPS != read(0, flags, MAX_NR_KEYMAPS)) {
-               fprintf(stderr, "Error reading keymap flags: %s\n",
-                               strerror(errno));
-               exit(FALSE);
-       }
+       if ((bb_full_read(0, buff, 7) != 7) || (strncmp(buff, BINARY_KEYMAP_MAGIC, 7) != 0))
+               bb_error_msg_and_die("This is not a valid binary keymap.");
 
-       ibuff = (u_short *) malloc(ibuffsz);
-       if (!ibuff) {
-               fprintf(stderr, "Out of memory.\n");
-               exit(FALSE);
-       }
+       if (bb_full_read(0, flags, MAX_NR_KEYMAPS) != MAX_NR_KEYMAPS)
+               bb_perror_msg_and_die("Error reading keymap flags");
 
        for (i = 0; i < MAX_NR_KEYMAPS; i++) {
                if (flags[i] == 1) {
-                       pos = 0;
-                       while (pos < ibuffsz) {
-                               if ((readsz = read(0, (char *) ibuff + pos, ibuffsz - pos))
-                                       < 0) {
-                                       fprintf(stderr, "Error reading keymap: %s\n",
-                                                       strerror(errno));
-                                       exit(FALSE);
-                               }
-                               pos += readsz;
-                       }
+                       bb_full_read(0, ibuff, NR_KEYS * sizeof(u_short));
                        for (j = 0; j < NR_KEYS; j++) {
                                ke.kb_index = j;
                                ke.kb_table = i;
@@ -91,8 +74,9 @@ int loadkmap_main(int argc, char **argv)
                        }
                }
        }
-       /* Don't bother to close files.  Exit does that 
+
+       /* Don't bother to close files.  Exit does that
         * automagically, so we can save a few bytes */
        /* close(fd); */
-       return(TRUE);
+       return EXIT_SUCCESS;
 }