logger: fix a problem of losing all argv except first

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

diff --git a/console-tools/setkeycodes.c b/console-tools/setkeycodes.c
index 1bdb909ea7de5af68204fd1c920237f65d950280..3de5f98568ab26425340586438a940f54498c459 100644 (file)
--- a/console-tools/setkeycodes.c
+++ b/console-tools/setkeycodes.c
@@ -4,80 +4,46 @@
  *
  * Copyright (C) 1994-1998 Andries E. Brouwer <aeb@cwi.nl>
  *
- * Adjusted for BusyBox by Erik Andersen <andersee@debian.org>
- *
- * 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
+ * Adjusted for BusyBox by Erik Andersen <andersen@codepoet.org>
  *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include "internal.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-
+//#include <sys/ioctl.h>
+#include "libbb.h"
 
 /* From <linux/kd.h> */
 struct kbkeycode {
        unsigned int scancode, keycode;
 };
-#define KDSETKEYCODE    0x4B4D  /* write kernel keycode table entry */
-
-
-static const char setkeycodes_usage[] =
-       "setkeycodes SCANCODE KEYCODE ...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-       "\nSet entries into the kernel's scancode-to-keycode map,\n"
-       "allowing unusual keyboards to generate usable keycodes.\n\n" 
-       "SCANCODE may be either xx or e0xx (hexadecimal),\n"
-       "and KEYCODE is given in decimal\n"
-#endif
-       ;
+enum {
+       KDSETKEYCODE = 0x4B4D  /* write kernel keycode table entry */
+};
 
-extern int 
-setkeycodes_main(int argc, char** argv)
+int setkeycodes_main(int argc, char** argv);
+int setkeycodes_main(int argc, char** argv)
 {
-    char *ep;
-    int fd, sc;
-    struct kbkeycode a;
+       int fd, sc;
+       struct kbkeycode a;
 
-    if (argc % 2 != 1 || argc < 2) {
-      usage(setkeycodes_usage);
+       if (argc % 2 != 1 || argc < 2) {
+               bb_show_usage();
        }
-        
-       fd = get_console_fd("/dev/console");
 
-    while (argc > 2) {
-       a.keycode = atoi(argv[2]);
-       a.scancode = sc = strtol(argv[1], &ep, 16);
-       if (*ep) {
-      fatalError("error reading SCANCODE: '%s'\n", argv[1]);
-       }
-       if (a.scancode > 127) {
-           a.scancode -= 0xe000;
-           a.scancode += 128;
-       }
-       if (a.scancode > 255 || a.keycode > 127) {
-      fatalError("SCANCODE or KEYCODE outside bounds\n");
-       }
-       if (ioctl(fd,KDSETKEYCODE,&a)) {
-           perror("KDSETKEYCODE");
-               fatalError("failed to set SCANCODE %x to KEYCODE %d\n", sc, a.keycode);
+       fd = get_console_fd();
+
+       while (argc > 2) {
+               a.keycode = xatoul_range(argv[2], 0, 127);
+               a.scancode = sc = xstrtoul_range(argv[1], 16, 0, 255);
+               if (a.scancode > 127) {
+                       a.scancode -= 0xe000;
+                       a.scancode += 128;
+               }
+               ioctl_or_perror_and_die(fd, KDSETKEYCODE, &a,
+                       "failed to set SCANCODE %x to KEYCODE %d",
+                       sc, a.keycode);
+               argc -= 2;
+               argv += 2;
        }
-       argc -= 2;
-       argv += 2;
-    }
-    return( TRUE);
+       return EXIT_SUCCESS;
 }