Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/console-tools/loadkmap.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/console-tools/loadkmap.c (modified) (4 diffs)

branches/2.2.5/mindi-busybox/console-tools/loadkmap.c

@@ -5 +5 @@
  * 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 tarball for details.
  *
  */
 
-#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"
+#include "libbb.h"
 
 #define BINARY_KEYMAP_MAGIC "bkeymap"
@@ -45 +26 @@
 #define MAX_NR_KEYMAPS  256
 
+int loadkmap_main(int argc, char **argv);
 int loadkmap_main(int argc, char **argv)
 {
     struct kbentry ke;
     int i, j, fd;
-    u_short ibuff[NR_KEYS];
+    uint16_t ibuff[NR_KEYS];
     char flags[MAX_NR_KEYMAPS];
     char buff[7];
@@ -56 +38 @@
         bb_show_usage();
 
-    fd = bb_xopen(CURRENT_VC, O_RDWR);
+    fd = xopen(CURRENT_VC, O_RDWR);
 
-    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(0, buff, 7);
+    if (strncmp(buff, BINARY_KEYMAP_MAGIC, 7))
+        bb_error_msg_and_die("this is 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(0, 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));
+            xread(0, ibuff, NR_KEYS * sizeof(uint16_t));
             for (j = 0; j < NR_KEYS; j++) {
                 ke.kb_index = j;
@@ -76 +58 @@
     }
 
-    /* Don't bother to close files.  Exit does that
-     * automagically, so we can save a few bytes */
-    /* close(fd); */
-    return EXIT_SUCCESS;
+    if (ENABLE_FEATURE_CLEAN_UP) close(fd);
+    return 0;
 }