accidentally applied wrong (old) patch, fixing up...

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

diff --git a/console-tools/dumpkmap.c b/console-tools/dumpkmap.c
index 590ba4d08dc1332f36eacfdf8f8131f462dc6f77..7c6633ae8435aa8148d3c184553ca00827690437 100644 (file)
--- a/console-tools/dumpkmap.c
+++ b/console-tools/dumpkmap.c
@@ -4,29 +4,10 @@
  *
  * 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 tarball for details.
  *
  */
 
-#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"
 
 /* From <linux/kd.h> */
@@ -35,11 +16,11 @@ 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)
 {
@@ -50,21 +31,15 @@ int dumpkmap_main(int argc, char **argv)
        if (argc >= 2 && *argv[1] == '-')
                bb_show_usage();
 
-       fd = bb_xopen(CURRENT_VC, O_RDWR);
+       fd = xopen(CURRENT_VC, O_RDWR);
 
        write(1, magic, 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);
-       flags[0] = 1;
-       flags[1] = 1;
-       flags[2] = 1;
-       flags[4] = 1;
-       flags[5] = 1;
-       flags[6] = 1;
-       flags[8] = 1;
-       flags[9] = 1;
-       flags[10] = 1;
-       flags[12] = 1;
+       memset(flags, 0x01, 13);
+       flags[3] = flags[7] = flags[11] = 0;
 
        /* dump flags */
        write(1, flags, MAX_NR_KEYMAPS);