init: O_NONBLOCK needs more thought. reverted for now

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

diff --git a/console-tools/dumpkmap.c b/console-tools/dumpkmap.c
index 62313e77f297eefd9d09efce152ed71bd5355680..c382b5af995bb69772b7e3de917efd7817a47e24 100644 (file)
--- a/console-tools/dumpkmap.c
+++ b/console-tools/dumpkmap.c
@@ -7,15 +7,9 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  *
  */
+/* no options, no getopt */
 
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/ioctl.h>
-#include "busybox.h"
+#include "libbb.h"
 
 /* From <linux/kd.h> */
 struct kbentry {
@@ -29,18 +23,18 @@ struct kbentry {
 #define NR_KEYS 128
 #define MAX_NR_KEYMAPS 256
 
-int dumpkmap_main(int argc, char **argv)
+int dumpkmap_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int dumpkmap_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
        struct kbentry ke;
        int i, j, fd;
-       char flags[MAX_NR_KEYMAPS], magic[] = "bkeymap";
+       RESERVE_CONFIG_BUFFER(flags,MAX_NR_KEYMAPS);
 
-       if (argc >= 2 && *argv[1] == '-')
-               bb_show_usage();
+/*     bb_warn_ignoring_args(argc>=2);*/
 
-       fd = bb_xopen(CURRENT_VC, O_RDWR);
+       fd = get_console_fd_or_die();
 
-       write(1, magic, 7);
+       write(STDOUT_FILENO, "bkeymap", 7);
 
        /* Here we want to set everything to 0 except for indexes:
         * [0-2] [4-6] [8-10] [12] */
@@ -49,24 +43,27 @@ int dumpkmap_main(int argc, char **argv)
        flags[3] = flags[7] = flags[11] = 0;
 
        /* dump flags */
-       write(1, flags, MAX_NR_KEYMAPS);
+       write(STDOUT_FILENO, flags, MAX_NR_KEYMAPS);
 
        for (i = 0; i < MAX_NR_KEYMAPS; i++) {
                if (flags[i] == 1) {
                        for (j = 0; j < NR_KEYS; j++) {
                                ke.kb_index = j;
                                ke.kb_table = i;
-                               if (ioctl(fd, KDGKBENT, &ke) < 0) {
-                                       bb_perror_msg("ioctl failed with %s, %s, %p",
+                               if (!ioctl_or_perror(fd, KDGKBENT, &ke,
+                                               "ioctl failed with %s, %s, %p",
                                                (char *)&ke.kb_index,
                                                (char *)&ke.kb_table,
-                                               &ke.kb_value);
-                               } else {
-                                       write(1, (void*)&ke.kb_value, 2);
+                                               &ke.kb_value)
+                               ) {
+                                       write(STDOUT_FILENO, (void*)&ke.kb_value, 2);
                                }
                        }
                }
        }
-       close(fd);
+       if (ENABLE_FEATURE_CLEAN_UP) {
+               close(fd);
+               RELEASE_CONFIG_BUFFER(flags);
+       }
        return EXIT_SUCCESS;
 }