gzip: bbunzip integration fixes

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

diff --git a/include/unarchive.h b/include/unarchive.h
index b5aacb62189439efd2dd0191078f37ccd7a4ec88..36b56a925d8938f0ad7031a9e12458701fcf2b71 100644 (file)
--- a/include/unarchive.h
+++ b/include/unarchive.h
@@ -1,14 +1,15 @@
+/* vi: set sw=4 ts=4: */
 #ifndef        __UNARCHIVE_H__
 #define        __UNARCHIVE_H__
 
-#define ARCHIVE_PRESERVE_DATE  1
-#define ARCHIVE_CREATE_LEADING_DIRS            2
-#define ARCHIVE_EXTRACT_UNCONDITIONAL  4
-#define ARCHIVE_EXTRACT_QUIET  8
-#define ARCHIVE_EXTRACT_NEWER  16
+#define ARCHIVE_PRESERVE_DATE           1
+#define ARCHIVE_CREATE_LEADING_DIRS     2
+#define ARCHIVE_EXTRACT_UNCONDITIONAL   4
+#define ARCHIVE_EXTRACT_QUIET           8
+#define ARCHIVE_EXTRACT_NEWER           16
+#define ARCHIVE_NOPRESERVE_OWN          32
+#define ARCHIVE_NOPRESERVE_PERM         64
 
-#include <sys/types.h>
-#include <stdio.h>
 #include "libbb.h"
 
 typedef struct file_headers_s {
@@ -23,11 +24,13 @@ typedef struct file_headers_s {
 } file_header_t;
 
 typedef struct archive_handle_s {
-       /* define if the header and data compenent should processed */
+       /* define if the header and data component should be processed */
        char (*filter)(struct archive_handle_s *);
        llist_t *accept;
+       /* List of files that have been rejected */
        llist_t *reject;
-       llist_t *passed;        /* List of files that have successfully been worked on */
+       /* List of files that have successfully been worked on */
+       llist_t *passed;
 
        /* Contains the processed header entry */
        file_header_t *file_header;
@@ -56,11 +59,12 @@ typedef struct archive_handle_s {
        /* Temporary storage */
        char *buffer;
 
-       /* Misc. stuff */
+       /* Flags and misc. stuff */
        unsigned char flags;
 
 } archive_handle_t;
 
+
 extern archive_handle_t *init_handle(void);
 
 extern char filter_accept_all(archive_handle_t *archive_handle);
@@ -79,30 +83,36 @@ extern void header_skip(const file_header_t *file_header);
 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_header_gzip_or_die(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_lzma(archive_handle_t *archive_handle);
 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 void seek_by_read(const archive_handle_t *archive_handle, const unsigned int amount);
 
-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 const llist_t *find_list_entry(const llist_t *list, const char *filename);
+extern const llist_t *find_list_entry2(const llist_t *list, const char *filename);
+
+extern USE_DESKTOP(long long) int uncompressStream(int src_fd, int dst_fd);
 
-extern int uncompressStream(int src_fd, int dst_fd);
-extern void inflate_init(unsigned int bufsize);
-extern void inflate_cleanup(void);
-extern int inflate_unzip(int in, int out);
-extern int inflate_gunzip(int in, int out);
+typedef struct inflate_unzip_result {
+       off_t bytes_out;
+       uint32_t crc;
+} inflate_unzip_result;
 
-extern int open_transformer(int src_fd, int (*transformer)(int src_fd, int dst_fd));
+extern USE_DESKTOP(long long) int inflate_unzip(inflate_unzip_result *res, unsigned bufsize, int in, int out);
+extern USE_DESKTOP(long long) int inflate_gunzip(int in, int out);
+extern USE_DESKTOP(long long) int unlzma(int src_fd, int dst_fd);
 
+extern int open_transformer(int src_fd,
+       USE_DESKTOP(long long) int (*transformer)(int src_fd, int dst_fd));
 
 #endif