X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=dumpkmap.c;h=0da01868b179cacff8210aad57e4653cb3ffbcef;hb=9ead68975c05100e4d1fda0b750fbc3688e68cfd;hp=2d989dfc499f83243d5eb1147848a9c48075480c;hpb=3570a34de46b1f7dedd16999bb1687e2d6b55d40;p=oweals%2Fbusybox.git

diff --git a/dumpkmap.c b/dumpkmap.c
index 2d989dfc4..0da01868b 100644
--- a/dumpkmap.c
+++ b/dumpkmap.c
@@ -20,11 +20,14 @@
  *
  */
 
-#include "busybox.h"
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
 #include <sys/ioctl.h>
+#include "busybox.h"
 
 /* From <linux/kd.h> */
 struct kbentry {
@@ -32,11 +35,11 @@ struct kbentry {
 	unsigned char kb_index;
 	unsigned short kb_value;
 };
-#define KDGKBENT        0x4B46  /* gets one entry in translation table */
+static const int KDGKBENT = 0x4B46;  /* gets one entry in translation table */
 
 /* From <linux/keyboard.h> */
-#define NR_KEYS         128
-#define MAX_NR_KEYMAPS  256
+static const int NR_KEYS = 128;
+static const int MAX_NR_KEYMAPS = 256;
 
 int dumpkmap_main(int argc, char **argv)
 {
@@ -45,13 +48,13 @@ int dumpkmap_main(int argc, char **argv)
 	char flags[MAX_NR_KEYMAPS], magic[] = "bkeymap";
 
 	if (argc>=2 && *argv[1]=='-') {
-		usage(dumpkmap_usage);
+		show_usage();
 	}
 
 	fd = open("/dev/tty0", O_RDWR);
 	if (fd < 0) {
-		errorMsg("Error opening /dev/tty0: %s\n", strerror(errno));
-		return 1;
+		perror_msg("Error opening /dev/tty0");
+		return EXIT_FAILURE;
 	}
 
 	write(1, magic, 7);
@@ -78,7 +81,7 @@ int dumpkmap_main(int argc, char **argv)
 				ke.kb_table = i;
 				if (ioctl(fd, KDGKBENT, &ke) < 0) {
 				
-					errorMsg("ioctl returned: %s, %s, %s, %xqq\n",strerror(errno),(char *)&ke.kb_index,(char *)&ke.kb_table,(int)&ke.kb_value);
+					error_msg("ioctl returned: %s, %s, %s, %xqq", strerror(errno),(char *)&ke.kb_index,(char *)&ke.kb_table,(int)&ke.kb_value);
 					}
 				else {
 					write(1,(void*)&ke.kb_value,2);	
@@ -88,5 +91,5 @@ int dumpkmap_main(int argc, char **argv)
 		}
 	}
 	close(fd);
-	return 0;
+	return EXIT_SUCCESS;
 }