diff options
| author | Rob Landley <rob@landley.net> | 2006-07-16 08:14:35 +0000 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2006-07-16 08:14:35 +0000 |
| commit | 534374755d618c9c36c9940c82756241c4b25a67 (patch) | |
| tree | fac906b4fa40a68c53cecf20215a7a25b3b1cab6 /console-tools | |
| parent | afb94ecf2bb6c53ce2a381d6ce45a426243c76d9 (diff) | |
| download | busybox-w32-534374755d618c9c36c9940c82756241c4b25a67.tar.gz busybox-w32-534374755d618c9c36c9940c82756241c4b25a67.tar.bz2 busybox-w32-534374755d618c9c36c9940c82756241c4b25a67.zip | |
Cleaup read() and write() variants, plus a couple of new functions like
xlseek and fdlength() for the new mkswap.
Diffstat (limited to 'console-tools')
| -rw-r--r-- | console-tools/loadkmap.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c index 499d34622..69d33bd95 100644 --- a/console-tools/loadkmap.c +++ b/console-tools/loadkmap.c | |||
| @@ -45,15 +45,15 @@ int loadkmap_main(int argc, char **argv) | |||
| 45 | 45 | ||
| 46 | fd = bb_xopen(CURRENT_VC, O_RDWR); | 46 | fd = bb_xopen(CURRENT_VC, O_RDWR); |
| 47 | 47 | ||
| 48 | if ((bb_full_read(0, buff, 7) != 7) || (strncmp(buff, BINARY_KEYMAP_MAGIC, 7) != 0)) | 48 | xread(0, buff, 7); |
| 49 | if (strncmp(buff, BINARY_KEYMAP_MAGIC, 7)) | ||
| 49 | bb_error_msg_and_die("This is not a valid binary keymap."); | 50 | bb_error_msg_and_die("This is not a valid binary keymap."); |
| 50 | 51 | ||
| 51 | if (bb_full_read(0, flags, MAX_NR_KEYMAPS) != MAX_NR_KEYMAPS) | 52 | xread(0, flags, MAX_NR_KEYMAPS); |
| 52 | bb_perror_msg_and_die("Error reading keymap flags"); | ||
| 53 | 53 | ||
| 54 | for (i = 0; i < MAX_NR_KEYMAPS; i++) { | 54 | for (i = 0; i < MAX_NR_KEYMAPS; i++) { |
| 55 | if (flags[i] == 1) { | 55 | if (flags[i] == 1) { |
| 56 | bb_full_read(0, ibuff, NR_KEYS * sizeof(u_short)); | 56 | xread(0, ibuff, NR_KEYS * sizeof(u_short)); |
| 57 | for (j = 0; j < NR_KEYS; j++) { | 57 | for (j = 0; j < NR_KEYS; j++) { |
| 58 | ke.kb_index = j; | 58 | ke.kb_index = j; |
| 59 | ke.kb_table = i; | 59 | ke.kb_table = i; |
| @@ -63,8 +63,6 @@ int loadkmap_main(int argc, char **argv) | |||
| 63 | } | 63 | } |
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | /* Don't bother to close files. Exit does that | 66 | if (ENABLE_FEATURE_CLEAN_UP) close(fd); |
| 67 | * automagically, so we can save a few bytes */ | 67 | return 0; |
| 68 | /* close(fd); */ | ||
| 69 | return EXIT_SUCCESS; | ||
| 70 | } | 68 | } |