Bump to version 1.22.1

[platform/upstream/busybox.git] / console-tools / dumpkmap.c

diff --git a/console-tools/dumpkmap.c b/console-tools/dumpkmap.c
index fe96206..bf8d690 100644 (file)
--- a/console-tools/dumpkmap.c
+++ b/console-tools/dumpkmap.c
@@ -4,30 +4,20 @@
  *
  * Copyright (C) Arne Bernin <arne@matrix.loopback.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  */
+/* no options, no getopt */
+
+//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 <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 {
@@ -35,50 +25,67 @@ struct kbentry {
        unsigned char kb_index;
        unsigned short kb_value;
 };
-static const int KDGKBENT = 0x4B46;  /* gets one entry in translation table */
+#define KDGKBENT 0x4B46  /* gets one entry in translation table */
 
 /* From <linux/keyboard.h> */
-static const int NR_KEYS = 128;
-static const int MAX_NR_KEYMAPS = 256;
+#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";
+#define flags bb_common_bufsiz1
 
-       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 = bb_xopen(CURRENT_VC, O_RDWR);
-
-       write(1, magic, 7);
+       fd = get_console_fd_or_die();
 
+#if 0
+       write(STDOUT_FILENO, "bkeymap", 7);
        /* Here we want to set everything to 0 except for indexes:
-        * [0-2] [4-6] [8-10] [12] */
-       memset(flags, 0x00, MAX_NR_KEYMAPS);
+        * [0-2] [4-6] [8-10] [12]
+        */
+       /*memset(flags, 0x00, MAX_NR_KEYMAPS); - already is */
        memset(flags, 0x01, 13);
        flags[3] = flags[7] = flags[11] = 0;
-
        /* dump flags */
-       write(1, flags, MAX_NR_KEYMAPS);
+       write(STDOUT_FILENO, flags, MAX_NR_KEYMAPS);
+#define flags7 flags
+#else
+       /* Same effect */
+       /*                     0 1 2 3 4 5 6 7 8 9 a b c=12 */
+       memcpy(flags, "bkeymap\1\1\1\0\1\1\1\0\1\1\1\0\1",
+       /* Can use sizeof, or sizeof-1. sizeof is even, using that */
+       /****/ sizeof("bkeymap\1\1\1\0\1\1\1\0\1\1\1\0\1")
+       );
+       write(STDOUT_FILENO, flags, 7 + MAX_NR_KEYMAPS);
+#define flags7 (flags + 7)
+#endif
 
-       for (i = 0; i < MAX_NR_KEYMAPS; i++) {
-               if (flags[i] == 1) {
+       for (i = 0; i < 13; i++) {
+               if (flags7[i]) {
                        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",
-                                               (char *)&ke.kb_index,
-                                               (char *)&ke.kb_table,
-                                               &ke.kb_value);
-                               } else {
-                                       write(1, (void*)&ke.kb_value, 2);
+                               if (!ioctl_or_perror(fd, KDGKBENT, &ke,
+                                               "ioctl(KDGKBENT{%d,%d}) failed",
+                                               j, i)
+                               ) {
+                                       write(STDOUT_FILENO, &ke.kb_value, 2);
                                }
                        }
                }
        }
-       close(fd);
+       if (ENABLE_FEATURE_CLEAN_UP) {
+               close(fd);
+       }
        return EXIT_SUCCESS;
 }