As we no longer use function pointers for read in common archiving code

[oweals/busybox.git] / include / unarchive.h

diff --git a/include/unarchive.h b/include/unarchive.h
index 8396f878ceebd73d47081499f83d78efef0fa9cb..bbf11b5570690e24ea9419dee37d0e84b45e4097 100644 (file)
--- a/include/unarchive.h
+++ b/include/unarchive.h
@@ -5,6 +5,7 @@
 #define ARCHIVE_CREATE_LEADING_DIRS            2
 #define ARCHIVE_EXTRACT_UNCONDITIONAL  4
 #define ARCHIVE_EXTRACT_QUIET  8
+#define ARCHIVE_EXTRACT_NEWER  16
 
 #include <sys/types.h>
 #include <stdio.h>
@@ -34,7 +35,7 @@ typedef struct archive_handle_s {
        /* process the header component, e.g. tar -t */
        void (*action_header)(const file_header_t *);
 
-       /* process the data componenet, e.g. extract to filesystem */
+       /* process the data component, e.g. extract to filesystem */
        void (*action_data)(struct archive_handle_s *);
        
        /* How to process any sub archive, e.g. get_header_tar_gz */
@@ -49,13 +50,10 @@ typedef struct archive_handle_s {
        /* Count the number of bytes processed */
        off_t offset;
 
-       /* Function that reads data: read or read_bz */
-       ssize_t (*read)(int fd, void *buf, size_t count);
-
        /* Function that skips data: read_by_char or read_by_skip */
        void (*seek)(const struct archive_handle_s *archive_handle, const unsigned int amount);
 
-       /* Temperary storage */
+       /* Temporary storage */
        char *buffer;
 
        /* Misc. stuff */
@@ -82,7 +80,6 @@ extern void header_list(const file_header_t *file_header);
 extern void header_verbose_list(const file_header_t *file_header);
 
 extern void check_header_gzip(int src_fd);
-extern void check_trailer_gzip(int src_fd);
 
 extern char get_header_ar(archive_handle_t *archive_handle);
 extern char get_header_cpio(archive_handle_t *archive_handle);
@@ -93,23 +90,18 @@ 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 unsigned char archive_xread_char(const archive_handle_t *archive_handle);
-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 ssize_t read_bz2(int fd, void *buf, size_t count);
-extern void BZ2_bzReadOpen(int fd, void *unused, int nUnused);
-extern void BZ2_bzReadClose(void);
-extern unsigned char uncompressStream(int src_fd, int dst_fd);
+extern int uncompressStream(int src_fd, int dst_fd);
+extern void inflate_init(unsigned int bufsize);
+extern int inflate_unzip(int in, int out);
+extern int inflate_gunzip(int in, int out);
+
+extern int open_transformer(int src_fd, int (*transformer)(int src_fd, int dst_fd));
 
-extern ssize_t read_gz(int fd, void *buf, size_t count);
-extern void GZ_gzReadOpen(int fd, void *unused, int nUnused);
-extern void GZ_gzReadClose(void);
-extern int inflate(int in, int out);
 
 #endif