diff options
| author | Glenn L McGrath <bug1@ihug.co.nz> | 2003-11-21 22:24:57 +0000 |
|---|---|---|
| committer | Glenn L McGrath <bug1@ihug.co.nz> | 2003-11-21 22:24:57 +0000 |
| commit | 7ffe1338647d2b890df3ae46e526410b21a90d18 (patch) | |
| tree | e949e5879a7083bac9e2da249363f9c613d0a409 /include | |
| parent | 1a2d75fd7273e8de936e5fd91462bdff381f9b62 (diff) | |
| download | busybox-7ffe1338647d2b890df3ae46e526410b21a90d18.tar.gz | |
As we no longer use function pointers for read in common archiving code
archive_xread can be replaced with bb_full_read, and archive_copy_file
with bb_copyfd*
bb_copyfd is split into two functions bb_copyfd_size and bb_copyfd_eof,
they share a common backend.
Diffstat (limited to 'include')
| -rw-r--r-- | include/libbb.h | 5 | ||||
| -rw-r--r-- | include/unarchive.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/libbb.h b/include/libbb.h index 22a77e610..5ff49114b 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -136,7 +136,8 @@ extern long *find_pid_by_name( const char* pidName); extern char *find_real_root_device_name(const char* name); extern char *bb_get_line_from_file(FILE *file); extern char *bb_get_chomped_line_from_file(FILE *file); -extern int bb_copyfd(int fd1, int fd2, const off_t chunksize); +extern int bb_copyfd_size(int fd1, int fd2, const off_t size); +extern int bb_copyfd_eof(int fd1, int fd2); extern void bb_xprint_and_close_file(FILE *file); extern int bb_xprint_file_by_name(const char *filename); extern char bb_process_escape_sequence(const char **ptr); @@ -480,6 +481,6 @@ extern void xregcomp(regex_t *preg, const char *regex, int cflags); #define HASH_SHA1 1 #define HASH_MD5 2 extern int hash_fd(int fd, const size_t size, const uint8_t hash_algo, uint8_t *hashval); - +extern size_t bb_full_fd_action(int src_fd, int dst_fd, const size_t size, ssize_t (*action)(int fd, const void *, size_t)); #endif /* __LIBCONFIG_H__ */ diff --git a/include/unarchive.h b/include/unarchive.h index 79ee99e37..bbf11b557 100644 --- a/include/unarchive.h +++ b/include/unarchive.h @@ -90,12 +90,10 @@ extern char get_header_tar_gz(archive_handle_t *archive_handle); extern void seek_by_jump(const archive_handle_t *archive_handle, const unsigned int amount); extern void seek_by_char(const archive_handle_t *archive_handle, const unsigned int amount); -extern ssize_t archive_xread(const archive_handle_t *archive_handle, unsigned char *buf, const size_t count); extern void archive_xread_all(const archive_handle_t *archive_handle, void *buf, const size_t count); extern ssize_t archive_xread_all_eof(archive_handle_t *archive_handle, unsigned char *buf, size_t count); extern void data_align(archive_handle_t *archive_handle, const unsigned short boundary); -extern void archive_copy_file(const archive_handle_t *archive_handle, const int dst_fd); extern const llist_t *find_list_entry(const llist_t *list, const char *filename); extern int uncompressStream(int src_fd, int dst_fd); |