diff options
author | Manuel Novoa III <mjn3@codepoet.org> | 2003-03-19 09:13:01 +0000 |
---|---|---|
committer | Manuel Novoa III <mjn3@codepoet.org> | 2003-03-19 09:13:01 +0000 |
commit | cad5364599eb5062d59e0c397ed638ddd61a8d5d (patch) | |
tree | a318d0f03aa076c74b576ea45dc543a5669e8e91 /console-tools/loadkmap.c | |
parent | e01f9662a5bd5d91be4f6b3941b57fff73cd5af1 (diff) | |
download | busybox-w32-cad5364599eb5062d59e0c397ed638ddd61a8d5d.tar.gz busybox-w32-cad5364599eb5062d59e0c397ed638ddd61a8d5d.tar.bz2 busybox-w32-cad5364599eb5062d59e0c397ed638ddd61a8d5d.zip |
Major coreutils update.
Diffstat (limited to 'console-tools/loadkmap.c')
-rw-r--r-- | console-tools/loadkmap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c index 4f217d630..f4208df63 100644 --- a/console-tools/loadkmap.c +++ b/console-tools/loadkmap.c | |||
@@ -51,18 +51,18 @@ int loadkmap_main(int argc, char **argv) | |||
51 | char flags[MAX_NR_KEYMAPS], buff[7]; | 51 | char flags[MAX_NR_KEYMAPS], buff[7]; |
52 | 52 | ||
53 | if (argc != 1) | 53 | if (argc != 1) |
54 | show_usage(); | 54 | bb_show_usage(); |
55 | 55 | ||
56 | fd = open(CURRENT_VC, O_RDWR); | 56 | fd = open(CURRENT_VC, O_RDWR); |
57 | if (fd < 0) | 57 | if (fd < 0) |
58 | perror_msg_and_die("Error opening " CURRENT_VC); | 58 | bb_perror_msg_and_die("Error opening " CURRENT_VC); |
59 | 59 | ||
60 | read(0, buff, 7); | 60 | read(0, buff, 7); |
61 | if (0 != strncmp(buff, BINARY_KEYMAP_MAGIC, 7)) | 61 | if (0 != strncmp(buff, BINARY_KEYMAP_MAGIC, 7)) |
62 | error_msg_and_die("This is not a valid binary keymap."); | 62 | bb_error_msg_and_die("This is not a valid binary keymap."); |
63 | 63 | ||
64 | if (MAX_NR_KEYMAPS != read(0, flags, MAX_NR_KEYMAPS)) | 64 | if (MAX_NR_KEYMAPS != read(0, flags, MAX_NR_KEYMAPS)) |
65 | perror_msg_and_die("Error reading keymap flags"); | 65 | bb_perror_msg_and_die("Error reading keymap flags"); |
66 | 66 | ||
67 | ibuff = (u_short *) xmalloc(ibuffsz); | 67 | ibuff = (u_short *) xmalloc(ibuffsz); |
68 | 68 | ||
@@ -71,7 +71,7 @@ int loadkmap_main(int argc, char **argv) | |||
71 | pos = 0; | 71 | pos = 0; |
72 | while (pos < ibuffsz) { | 72 | while (pos < ibuffsz) { |
73 | if ((readsz = read(0, (char *) ibuff + pos, ibuffsz - pos)) < 0) | 73 | if ((readsz = read(0, (char *) ibuff + pos, ibuffsz - pos)) < 0) |
74 | perror_msg_and_die("Error reading keymap"); | 74 | bb_perror_msg_and_die("Error reading keymap"); |
75 | pos += readsz; | 75 | pos += readsz; |
76 | } | 76 | } |
77 | for (j = 0; j < NR_KEYS; j++) { | 77 | for (j = 0; j < NR_KEYS; j++) { |