Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/console-tools/dumpkmap.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/console-tools/dumpkmap.c (modified) (4 diffs)

branches/2.2.9/mindi-busybox/console-tools/dumpkmap.c

@@ -5 +5 @@
  * Copyright (C) Arne Bernin <arne@matrix.loopback.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  */
+/* no options, no getopt */
 
 #include "libbb.h"
@@ -23 +24 @@
 #define MAX_NR_KEYMAPS 256
 
-int dumpkmap_main(int argc, char **argv);
-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)
 {
     struct kbentry ke;
     int i, j, fd;
-    char flags[MAX_NR_KEYMAPS];
+    RESERVE_CONFIG_BUFFER(flags, MAX_NR_KEYMAPS);
 
-    if (argc >= 2 && argv[1][0] == '-')
+    /* When user accidentally runs "dumpkmap FILE"
+     * instead of "dumpkmap >FILE", we'd dump binary stuff to tty.
+     * Let's prevent it: */
+    if (argv[1])
         bb_show_usage();
+/*  bb_warn_ignoring_args(argv[1]);*/
 
-    fd = xopen(CURRENT_VC, O_RDWR);
+    fd = get_console_fd_or_die();
 
-    write(1, "bkeymap", 7);
+    write(STDOUT_FILENO, "bkeymap", 7);
 
     /* Here we want to set everything to 0 except for indexes:
@@ -44 +49 @@
 
     /* dump flags */
-    write(1, flags, MAX_NR_KEYMAPS);
+    write(STDOUT_FILENO, flags, MAX_NR_KEYMAPS);
 
     for (i = 0; i < MAX_NR_KEYMAPS; i++) {
@@ -57 +62 @@
                         &ke.kb_value)
                 ) {
-                    write(1, (void*)&ke.kb_value, 2);
+                    write(STDOUT_FILENO, (void*)&ke.kb_value, 2);
                 }
             }
         }
     }
-    close(fd);
+    if (ENABLE_FEATURE_CLEAN_UP) {
+        close(fd);
+        RELEASE_CONFIG_BUFFER(flags);
+    }
     return EXIT_SUCCESS;
 }