Small size optimization from Aaron Lehmann

[oweals/busybox.git] / loadkmap.c

diff --git a/loadkmap.c b/loadkmap.c
index 905741467cc33e7371ceb8dffdcc7736b8eec7e3..4f217d6304cc104e0743353d29bf2c0953d113f5 100644 (file)
--- a/loadkmap.c
+++ b/loadkmap.c
@@ -20,67 +20,58 @@
  *
  */
 
-#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;
+};
+static const int KDSKBENT = 0x4B47;  /* sets one entry in translation table */
 
+/* From <linux/keyboard.h> */
+static const int NR_KEYS = 128;
+static const int 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];
+       char flags[MAX_NR_KEYMAPS], buff[7];
 
-       if (argc>=2 && *argv[1]=='-') {
-               usage(loadkmap_usage);
-       }
+       if (argc != 1)
+               show_usage();
 
-       fd = open("/dev/tty0", O_RDWR);
-       if (fd < 0) {
-               fprintf(stderr, "Error opening /dev/tty0: %s\n", strerror(errno));
-               exit(FALSE);
-       }
+       fd = open(CURRENT_VC, O_RDWR);
+       if (fd < 0)
+               perror_msg_and_die("Error opening " CURRENT_VC);
 
        read(0, buff, 7);
-       if (0 != strncmp(buff, magic, 7)) {
-               fprintf(stderr, "This is not a valid binary keymap.\n");
-               exit(FALSE);
-       }
+       if (0 != strncmp(buff, BINARY_KEYMAP_MAGIC, 7))
+               error_msg_and_die("This is not a valid binary keymap.");
 
-       if (MAX_NR_KEYMAPS != read(0, flags, MAX_NR_KEYMAPS)) {
-               fprintf(stderr, "Error reading keymap flags: %s\n",
-                               strerror(errno));
-               exit(FALSE);
-       }
+       if (MAX_NR_KEYMAPS != read(0, flags, MAX_NR_KEYMAPS))
+               perror_msg_and_die("Error reading keymap flags");
 
-       ibuff = (u_short *) malloc(ibuffsz);
-       if (!ibuff) {
-               fprintf(stderr, "Out of memory.\n");
-               exit(FALSE);
-       }
+       ibuff = (u_short *) xmalloc(ibuffsz);
 
        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);
-                               }
+                               if ((readsz = read(0, (char *) ibuff + pos, ibuffsz - pos)) < 0)
+                                       perror_msg_and_die("Error reading keymap");
                                pos += readsz;
                        }
                        for (j = 0; j < NR_KEYS; j++) {
@@ -94,5 +85,5 @@ int loadkmap_main(int argc, char **argv)
        /* Don't bother to close files.  Exit does that 
         * automagically, so we can save a few bytes */
        /* close(fd); */
-       return(TRUE);
+       return EXIT_SUCCESS;
 }