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 43c1cc795ef813472f5135ce697793c67c04b715..2d1c9e2848178d9e4257c524e57c8355de7f1da2 100644 (file)
--- a/console-tools/loadkmap.c
+++ b/console-tools/loadkmap.c
@@ -4,27 +4,9 @@
  *
  * 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.
  */
-
-#include "busybox.h"
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <sys/ioctl.h>
+#include "libbb.h"
 
 #define BINARY_KEYMAP_MAGIC "bkeymap"
 
@@ -34,43 +16,43 @@ struct kbentry {
        unsigned char kb_index;
        unsigned short kb_value;
 };
-static const int KDSKBENT = 0x4B47;  /* sets one entry in translation table */
+/* sets one entry in translation table */
+#define KDSKBENT        0x4B47
 
 /* 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 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;
-       u_short *ibuff;
-       int i, j, fd, readsz, pos, ibuffsz = NR_KEYS * sizeof(u_short);
-       char flags[MAX_NR_KEYMAPS], buff[7];
-
-       if (argc != 1)
-               usage(loadkmap_usage);
+       int i, j, fd;
+       uint16_t ibuff[NR_KEYS];
+/*     const char *tty_name = CURRENT_TTY; */
+       RESERVE_CONFIG_BUFFER(flags, MAX_NR_KEYMAPS);
 
-       fd = open("/dev/tty0", O_RDWR);
-       if (fd < 0)
-               perror_msg_and_die("Error opening /dev/tty0");
+       /* 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);
+*/
 
-       read(0, buff, 7);
-       if (0 != strncmp(buff, BINARY_KEYMAP_MAGIC, 7))
-               error_msg_and_die("This is not a valid binary keymap.\n");
+       xread(STDIN_FILENO, flags, 7);
+       if (strncmp(flags, BINARY_KEYMAP_MAGIC, 7))
+               bb_error_msg_and_die("not a valid binary keymap");
 
-       if (MAX_NR_KEYMAPS != read(0, flags, MAX_NR_KEYMAPS))
-               perror_msg_and_die("Error reading keymap flags");
-
-       ibuff = (u_short *) xmalloc(ibuffsz);
+       xread(STDIN_FILENO, flags, MAX_NR_KEYMAPS);
 
        for (i = 0; i < MAX_NR_KEYMAPS; i++) {
                if (flags[i] == 1) {
-                       pos = 0;
-                       while (pos < ibuffsz) {
-                               if ((readsz = read(0, (char *) ibuff + pos, ibuffsz - pos)) < 0)
-                                       perror_msg_and_die("Error reading keymap");
-                               pos += readsz;
-                       }
+                       xread(STDIN_FILENO, ibuff, NR_KEYS * sizeof(uint16_t));
                        for (j = 0; j < NR_KEYS; j++) {
                                ke.kb_index = j;
                                ke.kb_table = i;
@@ -79,8 +61,10 @@ int loadkmap_main(int argc, char **argv)
                        }
                }
        }
-       /* 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;
 }