tcpudp: trivial build fix

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

diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c
index 499d34622dce26ce29ce3a9ea5c1d40d3f41a729..bea5a771f3ef62303c45cb4bb291866dd2901798 100644 (file)
--- a/console-tools/loadkmap.c
+++ b/console-tools/loadkmap.c
@@ -8,14 +8,7 @@
  *
  */
 
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-#include "busybox.h"
+#include "libbb.h"
 
 #define BINARY_KEYMAP_MAGIC "bkeymap"
 
@@ -32,28 +25,29 @@ struct kbentry {
 #define NR_KEYS         128
 #define MAX_NR_KEYMAPS  256
 
-int loadkmap_main(int argc, char **argv)
+int loadkmap_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int loadkmap_main(int argc, char **argv ATTRIBUTE_UNUSED)
 {
        struct kbentry ke;
        int i, j, fd;
-       u_short ibuff[NR_KEYS];
+       uint16_t ibuff[NR_KEYS];
        char flags[MAX_NR_KEYMAPS];
        char buff[7];
 
        if (argc != 1)
                bb_show_usage();
 
-       fd = bb_xopen(CURRENT_VC, O_RDWR);
+       fd = xopen(CURRENT_VC, O_RDWR);
 
-       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.");
+       xread(0, buff, 7);
+       if (strncmp(buff, BINARY_KEYMAP_MAGIC, 7))
+               bb_error_msg_and_die("this is not a valid binary keymap");
 
-       if (bb_full_read(0, flags, MAX_NR_KEYMAPS) != MAX_NR_KEYMAPS)
-               bb_perror_msg_and_die("Error reading keymap flags");
+       xread(0, flags, MAX_NR_KEYMAPS);
 
        for (i = 0; i < MAX_NR_KEYMAPS; i++) {
                if (flags[i] == 1) {
-                       bb_full_read(0, ibuff, NR_KEYS * sizeof(u_short));
+                       xread(0, ibuff, NR_KEYS * sizeof(uint16_t));
                        for (j = 0; j < NR_KEYS; j++) {
                                ke.kb_index = j;
                                ke.kb_table = i;
@@ -63,8 +57,6 @@ 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 EXIT_SUCCESS;
+       if (ENABLE_FEATURE_CLEAN_UP) close(fd);
+       return 0;
 }