Changed gz_open to ruturn a stream

[oweals/busybox.git] / loadkmap.c

diff --git a/loadkmap.c b/loadkmap.c
index 75b40da9aa672ac18f38946c9ca05b13799b2459..dcb5c1caa1ef2e4b6b3772018df441d1fe948fbb 100644 (file)
--- a/loadkmap.c
+++ b/loadkmap.c
@@ -20,7 +20,6 @@
  *
  */
 
-#include "busybox.h"
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -28,6 +27,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
+#include "busybox.h"
 
 #define BINARY_KEYMAP_MAGIC "bkeymap"
 
@@ -51,7 +51,7 @@ int loadkmap_main(int argc, char **argv)
        char flags[MAX_NR_KEYMAPS], buff[7];
 
        if (argc != 1)
-               usage(loadkmap_usage);
+               show_usage();
 
        fd = open("/dev/tty0", O_RDWR);
        if (fd < 0)
@@ -59,7 +59,7 @@ int loadkmap_main(int argc, char **argv)
 
        read(0, buff, 7);
        if (0 != strncmp(buff, BINARY_KEYMAP_MAGIC, 7))
-               error_msg_and_die("This is not a valid binary keymap.\n");
+               error_msg_and_die("This is not a valid binary keymap.");
 
        if (MAX_NR_KEYMAPS != read(0, flags, MAX_NR_KEYMAPS))
                perror_msg_and_die("Error reading keymap flags");