diff options
| author | Rob Landley | 2006-07-16 08:14:35 +0000 |
|---|---|---|
| committer | Rob Landley | 2006-07-16 08:14:35 +0000 |
| commit | 534374755d618c9c36c9940c82756241c4b25a67 (patch) | |
| tree | fac906b4fa40a68c53cecf20215a7a25b3b1cab6 /archival/libunarchive/get_header_cpio.c | |
| parent | afb94ecf2bb6c53ce2a381d6ce45a426243c76d9 (diff) | |
| download | busybox-534374755d618c9c36c9940c82756241c4b25a67.zip busybox-534374755d618c9c36c9940c82756241c4b25a67.tar.gz | |
Cleaup read() and write() variants, plus a couple of new functions like
xlseek and fdlength() for the new mkswap.
Diffstat (limited to 'archival/libunarchive/get_header_cpio.c')
| -rw-r--r-- | archival/libunarchive/get_header_cpio.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/archival/libunarchive/get_header_cpio.c b/archival/libunarchive/get_header_cpio.c index 725c491..28c7435 100644 --- a/archival/libunarchive/get_header_cpio.c +++ b/archival/libunarchive/get_header_cpio.c @@ -76,7 +76,8 @@ char get_header_cpio(archive_handle_t *archive_handle) } file_header->name = (char *) xzalloc(namesize + 1); - archive_xread_all(archive_handle, file_header->name, namesize); /* Read in filename */ + /* Read in filename */ + xread(archive_handle->src_fd, file_header->name, namesize); archive_handle->offset += namesize; /* Update offset amount and skip padding before file contents */ @@ -103,7 +104,7 @@ char get_header_cpio(archive_handle_t *archive_handle) if (S_ISLNK(file_header->mode)) { file_header->link_name = (char *) xzalloc(file_header->size + 1); - archive_xread_all(archive_handle, file_header->link_name, file_header->size); + xread(archive_handle->src_fd, file_header->link_name, file_header->size); archive_handle->offset += file_header->size; file_header->size = 0; /* Stop possible seeks in future */ } else { |