Fix 'thinko'.

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

diff --git a/include/unarchive.h b/include/unarchive.h
index e564e9572ef6d0dc0b504511de45a7663b57d44b..8396f878ceebd73d47081499f83d78efef0fa9cb 100644 (file)
--- a/include/unarchive.h
+++ b/include/unarchive.h
@@ -7,13 +7,8 @@
 #define ARCHIVE_EXTRACT_QUIET  8
 
 #include <sys/types.h>
-
-typedef struct gunzip_s {
-       unsigned short buffer_count;
-       unsigned char *buffer;
-       unsigned int crc;
-       unsigned int count;
-} gunzip_t;
+#include <stdio.h>
+#include "libbb.h"
 
 typedef struct file_headers_s {
        char *name;
@@ -26,16 +21,12 @@ typedef struct file_headers_s {
        dev_t device;
 } file_header_t;
 
-typedef struct llist_s {
-       const char *data;
-       const struct llist_s *link;
-} llist_t;
-
 typedef struct archive_handle_s {
        /* define if the header and data compenent should processed */
-       char (*filter)(const llist_t *, const llist_t *, const char *);
-       const llist_t *accept;
-       const llist_t *reject;
+       char (*filter)(struct archive_handle_s *);
+       llist_t *accept;
+       llist_t *reject;
+       llist_t *passed;        /* List of files that have successfully been worked on */
 
        /* Contains the processed header entry */
        file_header_t *file_header;
@@ -45,6 +36,8 @@ typedef struct archive_handle_s {
 
        /* process the data componenet, e.g. extract to filesystem */
        void (*action_data)(struct archive_handle_s *);
+       
+       /* How to process any sub archive, e.g. get_header_tar_gz */
        char (*action_data_subarchive)(struct archive_handle_s *);
 
        /* Contains the handle to a sub archive */
@@ -56,6 +49,15 @@ 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 */
+       char *buffer;
+
        /* Misc. stuff */
        unsigned char flags;
 
@@ -63,16 +65,17 @@ typedef struct archive_handle_s {
 
 extern archive_handle_t *init_handle(void);
 
-extern char filter_accept_all(const llist_t *accept_list, const llist_t *reject_list, const char *key);
-extern char filter_accept_list(const llist_t *accept_list, const llist_t *reject_list, const char *key);
-extern char filter_accept_reject_list(const llist_t *accept_list, const llist_t *reject_list, const char *key);
+extern char filter_accept_all(archive_handle_t *archive_handle);
+extern char filter_accept_list(archive_handle_t *archive_handle);
+extern char filter_accept_list_reassign(archive_handle_t *archive_handle);
+extern char filter_accept_reject_list(archive_handle_t *archive_handle);
 
 extern void unpack_ar_archive(archive_handle_t *ar_archive);
 
-extern void data_gunzip(archive_handle_t *archive_handle);
 extern void data_skip(archive_handle_t *archive_handle);
 extern void data_extract_all(archive_handle_t *archive_handle);
 extern void data_extract_to_stdout(archive_handle_t *archive_handle);
+extern void data_extract_to_buffer(archive_handle_t *archive_handle);
 
 extern void header_skip(const file_header_t *file_header);
 extern void header_list(const file_header_t *file_header);
@@ -82,12 +85,31 @@ 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);
 extern char get_header_tar(archive_handle_t *archive_handle);
+extern char get_header_tar_bz2(archive_handle_t *archive_handle);
 extern char get_header_tar_gz(archive_handle_t *archive_handle);
 
-//extern void seek_sub_file(int src_fd, unsigned int amount);
-extern const unsigned short data_align(const int src_fd, const unsigned int offset, const unsigned short align_to);
-extern const llist_t *add_to_list(const llist_t *old_head, const char *new_item);
-extern int copy_file_chunk_fd(int src_fd, int dst_fd, unsigned long long chunksize);
+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 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