lineedit: do not hang on error, but return error indicator.

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

diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c
index ce9b6817c0039ec694682c41250721414c3bed14..2d1c9e2848178d9e4257c524e57c8355de7f1da2 100644 (file)
--- a/console-tools/loadkmap.c
+++ b/console-tools/loadkmap.c
@@ -4,11 +4,9 @@
  *
  * Copyright (C) 1998 Enrique Zanardi <ezanardi@ull.es>
  *
- * 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.
  */
-
-#include "busybox.h"
+#include "libbb.h"
 
 #define BINARY_KEYMAP_MAGIC "bkeymap"
 
@@ -25,28 +23,36 @@ 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 = get_console_fd_or_die();
+/* or maybe:
+       opt = getopt32(argv, "C:", &tty_name);
+       fd = xopen_nonblocking(tty_name);
+*/
 
-       fd = xopen(CURRENT_VC, O_RDWR);
+       xread(STDIN_FILENO, flags, 7);
+       if (strncmp(flags, BINARY_KEYMAP_MAGIC, 7))
+               bb_error_msg_and_die("not a valid binary keymap");
 
-       xread(0, buff, 7);
-       if (strncmp(buff, BINARY_KEYMAP_MAGIC, 7))
-               bb_error_msg_and_die("this is not a valid binary keymap");
-
-       xread(0, flags, MAX_NR_KEYMAPS);
+       xread(STDIN_FILENO, flags, MAX_NR_KEYMAPS);
 
        for (i = 0; i < MAX_NR_KEYMAPS; i++) {
                if (flags[i] == 1) {
-                       xread(0, ibuff, NR_KEYS * sizeof(u_short));
+                       xread(STDIN_FILENO, ibuff, NR_KEYS * sizeof(uint16_t));
                        for (j = 0; j < NR_KEYS; j++) {
                                ke.kb_index = j;
                                ke.kb_table = i;
@@ -56,6 +62,9 @@ int loadkmap_main(int argc, char **argv)
                }
        }
 
-       if (ENABLE_FEATURE_CLEAN_UP) close(fd);
-       return 0;
+       if (ENABLE_FEATURE_CLEAN_UP) {
+               close(fd);
+               RELEASE_CONFIG_BUFFER(flags);
+       }
+       return EXIT_SUCCESS;
 }