X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=console-tools%2Fdumpkmap.c;h=6b923d2d47bd4f9bd8d2152fe12f31f1eaa8ed3d;hb=45dc96c8a6dce3aeea983f6c32572d4cee646b5d;hp=7c6633ae8435aa8148d3c184553ca00827690437;hpb=d921b2ecc0d294ad4bf8c7458fc52a60c28727d2;p=oweals%2Fbusybox.git

diff --git a/console-tools/dumpkmap.c b/console-tools/dumpkmap.c
index 7c6633ae8..6b923d2d4 100644
--- a/console-tools/dumpkmap.c
+++ b/console-tools/dumpkmap.c
@@ -4,11 +4,20 @@
  *
  * 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 "busybox.h"
+//usage:#define dumpkmap_trivial_usage
+//usage:       "> keymap"
+//usage:#define dumpkmap_full_usage "\n\n"
+//usage:       "Print a binary keyboard translation table to stdout"
+//usage:
+//usage:#define dumpkmap_example_usage
+//usage:       "$ dumpkmap > keymap\n"
+
+#include "libbb.h"
 
 /* From <linux/kd.h> */
 struct kbentry {
@@ -22,18 +31,23 @@ 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)
 {
 	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] == '-')
+	/* 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, 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] */
@@ -42,24 +56,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;
 }