I have to assume both Avaks and LSILogic are deliberatly ignoring me.

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

diff --git a/console-tools/dumpkmap.c b/console-tools/dumpkmap.c
index d2bb6dcff10c772af7749f148d39b0c9db178eab..6085a446b8b2d9bdf46449991f341b26b66b1b32 100644 (file)
--- a/console-tools/dumpkmap.c
+++ b/console-tools/dumpkmap.c
@@ -48,19 +48,15 @@ int dumpkmap_main(int argc, char **argv)
        char flags[MAX_NR_KEYMAPS], magic[] = "bkeymap";
 
        if (argc>=2 && *argv[1]=='-') {
-               show_usage();
+               bb_show_usage();
        }
 
-       fd = open(CURRENT_VC, O_RDWR);
-       if (fd < 0) {
-               perror_msg("Error opening " CURRENT_VC);
-               return EXIT_FAILURE;
-       }
+       fd=bb_xopen(CURRENT_VC, O_RDWR);
 
        write(1, magic, 7);
 
        for (i=0; i < MAX_NR_KEYMAPS; i++) flags[i]=0;
-       flags[0]=1; 
+       flags[0]=1;
        flags[1]=1;
        flags[2]=1;
        flags[4]=1;
@@ -70,9 +66,9 @@ int dumpkmap_main(int argc, char **argv)
        flags[9]=1;
        flags[10]=1;
        flags[12]=1;
-       
+
        /* dump flags */
-       for (i=0; i < MAX_NR_KEYMAPS; i++) write(1,&flags[i],1); 
+       for (i=0; i < MAX_NR_KEYMAPS; i++) write(1,&flags[i],1);
 
        for (i = 0; i < MAX_NR_KEYMAPS; i++) {
                if (flags[i] == 1) {
@@ -80,13 +76,13 @@ int dumpkmap_main(int argc, char **argv)
                                ke.kb_index = j;
                                ke.kb_table = i;
                                if (ioctl(fd, KDGKBENT, &ke) < 0) {
-                               
-                                       error_msg("ioctl returned: %m, %s, %s, %xqq", (char *)&ke.kb_index,(char *)&ke.kb_table,(int)&ke.kb_value);
+
+                                       bb_error_msg("ioctl returned: %m, %s, %s, %xqq", (char *)&ke.kb_index,(char *)&ke.kb_table,(int)&ke.kb_value);
                                        }
                                else {
-                                       write(1,(void*)&ke.kb_value,2); 
-                                       }       
-                               
+                                       write(1,(void*)&ke.kb_value,2);
+                                       }
+
                        }
                }
        }