From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- .../src/router/busybox/console-tools/dumpkmap.c | 88 ++++++++-------------- 1 file changed, 31 insertions(+), 57 deletions(-) (limited to 'release/src/router/busybox/console-tools/dumpkmap.c') diff --git a/release/src/router/busybox/console-tools/dumpkmap.c b/release/src/router/busybox/console-tools/dumpkmap.c index 85926556..c382b5af 100644 --- a/release/src/router/busybox/console-tools/dumpkmap.c +++ b/release/src/router/busybox/console-tools/dumpkmap.c @@ -4,30 +4,12 @@ * * Copyright (C) Arne Bernin * - * 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. * */ +/* no options, no getopt */ -#include -#include -#include -#include -#include -#include -#include -#include "busybox.h" +#include "libbb.h" /* From */ struct kbentry { @@ -35,61 +17,53 @@ 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 */ -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 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 = open(CURRENT_VC, O_RDWR); - if (fd < 0) { - bb_perror_msg("Error opening " CURRENT_VC); - return EXIT_FAILURE; - } + fd = get_console_fd_or_die(); + + write(STDOUT_FILENO, "bkeymap", 7); - 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); + memset(flags, 0x01, 13); + flags[3] = flags[7] = flags[11] = 0; - for (i=0; i < MAX_NR_KEYMAPS; i++) flags[i]=0; - 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; - /* dump flags */ - for (i=0; i < MAX_NR_KEYMAPS; i++) write(1,&flags[i],1); + 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_error_msg("ioctl returned: %m, %s, %s, %xqq", (char *)&ke.kb_index,(char *)&ke.kb_table,(int)&ke.kb_value); - } - else { - write(1,(void*)&ke.kb_value,2); - } - + if (!ioctl_or_perror(fd, KDGKBENT, &ke, + "ioctl failed with %s, %s, %p", + (char *)&ke.kb_index, + (char *)&ke.kb_table, + &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; } -- cgit v1.2.3-54-g00ecf