ls: handle -i through option_mask32

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

diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c
index 5b2f31abcf8af840c85ca8e026359ca05f98af5a..70ab55a8e88cb0a2980ec7d0aa35612cd852f2f4 100644 (file)
--- a/console-tools/loadkmap.c
+++ b/console-tools/loadkmap.c
@@ -4,30 +4,31 @@
  *
  * Copyright (C) 1998 Enrique Zanardi <ezanardi@ull.es>
  *
- * 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.
  */
+//config:config LOADKMAP
+//config:      bool "loadkmap"
+//config:      default y
+//config:      select PLATFORM_LINUX
+//config:      help
+//config:        This program loads a keyboard translation table from
+//config:        standard input.
+
+//applet:IF_LOADKMAP(APPLET(loadkmap, BB_DIR_SBIN, BB_SUID_DROP))
 
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-#include "busybox.h"
+//kbuild:lib-$(CONFIG_LOADKMAP) += loadkmap.o
+
+//usage:#define loadkmap_trivial_usage
+//usage:       "< keymap"
+//usage:#define loadkmap_full_usage "\n\n"
+//usage:       "Load a binary keyboard translation table from stdin"
+////usage:       "\n"
+////usage:       "\n   -C TTY  Affect TTY instead of /dev/tty"
+//usage:
+//usage:#define loadkmap_example_usage
+//usage:       "$ loadkmap < /etc/i18n/lang-keymap\n"
+
+#include "libbb.h"
 
 #define BINARY_KEYMAP_MAGIC "bkeymap"
 
@@ -44,39 +45,59 @@ struct kbentry {
 #define NR_KEYS         128
 #define MAX_NR_KEYMAPS  256
 
-int loadkmap_main(int argc, char **argv)
+int loadkmap_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int loadkmap_main(int argc UNUSED_PARAM, char **argv)
 {
        struct kbentry ke;
        int i, j, fd;
-       u_short ibuff[NR_KEYS];
-       char flags[MAX_NR_KEYMAPS];
-       char buff[7];
+       uint16_t ibuff[NR_KEYS];
+/*     const char *tty_name = CURRENT_TTY; */
+       RESERVE_CONFIG_BUFFER(flags, MAX_NR_KEYMAPS);
 
-       if (argc != 1)
+       /* When user accidentally runs "loadkmap FILE"
+        * instead of "loadkmap <FILE", we end up waiting for input from tty.
+        * Let's prevent it: */
+       if (argv[1])
                bb_show_usage();
+/* bb_warn_ignoring_args(argv[1]); */
 
-       fd = bb_xopen(CURRENT_VC, O_RDWR);
+       fd = get_console_fd_or_die();
+/* or maybe:
+       opt = getopt32(argv, "C:", &tty_name);
+       fd = xopen_nonblocking(tty_name);
+*/
 
-       if ((bb_full_read(0, buff, 7) != 7) || (strncmp(buff, BINARY_KEYMAP_MAGIC, 7) != 0))
-               bb_error_msg_and_die("This is not a valid binary keymap.");
+       xread(STDIN_FILENO, flags, 7);
+       if (!is_prefixed_with(flags, BINARY_KEYMAP_MAGIC))
+               bb_error_msg_and_die("not a valid binary keymap");
 
-       if (bb_full_read(0, flags, MAX_NR_KEYMAPS) != MAX_NR_KEYMAPS)
-               bb_perror_msg_and_die("Error reading keymap flags");
+       xread(STDIN_FILENO, flags, MAX_NR_KEYMAPS);
 
        for (i = 0; i < MAX_NR_KEYMAPS; i++) {
-               if (flags[i] == 1) {
-                       bb_full_read(0, ibuff, NR_KEYS * sizeof(u_short));
-                       for (j = 0; j < NR_KEYS; j++) {
-                               ke.kb_index = j;
-                               ke.kb_table = i;
-                               ke.kb_value = ibuff[j];
-                               ioctl(fd, KDSKBENT, &ke);
-                       }
+               if (flags[i] != 1)
+                       continue;
+               xread(STDIN_FILENO, ibuff, NR_KEYS * sizeof(uint16_t));
+               for (j = 0; j < NR_KEYS; j++) {
+                       ke.kb_index = j;
+                       ke.kb_table = i;
+                       ke.kb_value = ibuff[j];
+                       /*
+                        * Note: table[idx:0] can contain special value
+                        * K_ALLOCATED (marks allocated tables in kernel).
+                        * dumpkmap saves the value as-is; but attempts
+                        * to load it here fail, since it isn't a valid
+                        * key value: it is K(KT_SPEC,126) == 2<<8 + 126,
+                        * whereas last valid KT_SPEC is
+                        * K_BARENUMLOCK == K(KT_SPEC,19).
+                        * So far we just ignore these errors:
+                        */
+                       ioctl(fd, KDSKBENT, &ke);
                }
        }
 
-       /* Don't bother to close files.  Exit does that 
-        * automagically, so we can save a few bytes */
-       /* close(fd); */
+       if (ENABLE_FEATURE_CLEAN_UP) {
+               close(fd);
+               RELEASE_CONFIG_BUFFER(flags);
+       }
        return EXIT_SUCCESS;
 }