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 b891c9b0e47e324856e3a7726fc80861648536e3..2d1c9e2848178d9e4257c524e57c8355de7f1da2 100644 (file)
--- a/console-tools/loadkmap.c
+++ b/console-tools/loadkmap.c
@@ -4,10 +4,8 @@
  *
  * 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 "libbb.h"
 
 #define BINARY_KEYMAP_MAGIC "bkeymap"
@@ -26,16 +24,25 @@ struct kbentry {
 #define MAX_NR_KEYMAPS  256
 
 int loadkmap_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int loadkmap_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
+int loadkmap_main(int argc UNUSED_PARAM, char **argv)
 {
        struct kbentry ke;
        int i, j, fd;
        uint16_t ibuff[NR_KEYS];
-       RESERVE_CONFIG_BUFFER(flags,MAX_NR_KEYMAPS);
-
-/*  bb_warn_ignoring_args(argc>=2);*/
+/*     const char *tty_name = CURRENT_TTY; */
+       RESERVE_CONFIG_BUFFER(flags, MAX_NR_KEYMAPS);
 
-       fd = xopen(CURRENT_VC, O_RDWR);
+       /* 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);
+*/
 
        xread(STDIN_FILENO, flags, 7);
        if (strncmp(flags, BINARY_KEYMAP_MAGIC, 7))