Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/include/unarchive.h

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/include/unarchive.h (modified) (7 diffs)

branches/2.2.5/mindi-busybox/include/unarchive.h

@@ -11 +11 @@
 #define ARCHIVE_NOPRESERVE_PERM         64
 
-#include <sys/types.h>
-#include <stdio.h>
-#include "libbb.h"
-
-typedef struct file_headers_s {
+typedef struct file_header_t {
     char *name;
-    char *link_name;
+    char *link_target;
     off_t size;
     uid_t uid;
@@ -26 +22 @@
 } file_header_t;
 
-typedef struct archive_handle_s {
-    /* define if the header and data component should processed */
-    char (*filter)(struct archive_handle_s *);
+typedef struct archive_handle_t {
+    /* define if the header and data component should be processed */
+    char (*filter)(struct archive_handle_t *);
     llist_t *accept;
     /* List of files that have been rejected */
@@ -42 +38 @@
 
     /* process the data component, e.g. extract to filesystem */
-    void (*action_data)(struct archive_handle_s *);
+    void (*action_data)(struct archive_handle_t *);
 
     /* How to process any sub archive, e.g. get_header_tar_gz */
-    char (*action_data_subarchive)(struct archive_handle_s *);
+    char (*action_data_subarchive)(struct archive_handle_t *);
 
     /* Contains the handle to a sub archive */
-    struct archive_handle_s *sub_archive;
+    struct archive_handle_t *sub_archive;
 
     /* The raw stream as read from disk or stdin */
@@ -57 +53 @@
 
     /* Function that skips data: read_by_char or read_by_skip */
-    void (*seek)(const struct archive_handle_s *archive_handle, const unsigned int amount);
+    void (*seek)(const struct archive_handle_t *archive_handle, const unsigned amount);
 
     /* Temporary storage */
@@ -66 +62 @@
 
 } archive_handle_t;
+
 
 extern archive_handle_t *init_handle(void);
@@ -85 +82 @@
 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);
@@ -94 +91 @@
 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_jump(const archive_handle_t *archive_handle, const unsigned amount);
+extern void seek_by_read(const archive_handle_t *archive_handle, const unsigned 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 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);
-extern int unlzma(int src_fd, int dst_fd);
+/* A bit of bunzip2 internals are exposed for compressed help support: */
+typedef struct bunzip_data bunzip_data;
+int start_bunzip(bunzip_data **bdp, int in_fd, const unsigned char *inbuf, int len);
+int read_bunzip(bunzip_data *bd, char *outbuf, int len);
+void dealloc_bunzip(bunzip_data *bd);
 
-extern int open_transformer(int src_fd, int (*transformer)(int src_fd, int dst_fd));
+typedef struct inflate_unzip_result {
+    off_t bytes_out;
+    uint32_t crc;
+} inflate_unzip_result;
 
+extern USE_DESKTOP(long long) int unpack_bz2_stream(int src_fd, int dst_fd);
+extern USE_DESKTOP(long long) int inflate_unzip(inflate_unzip_result *res, unsigned bufsize, int src_fd, int dst_fd);
+extern USE_DESKTOP(long long) int unpack_gz_stream(int src_fd, int dst_fd);
+extern USE_DESKTOP(long long) int unpack_lzma_stream(int src_fd, int dst_fd);
+
+#if BB_MMU
+extern int open_transformer(int src_fd,
+    USE_DESKTOP(long long) int (*transformer)(int src_fd, int dst_fd));
+#define open_transformer(src_fd, transformer, transform_prog, ...) open_transformer(src_fd, transformer)
+#else
+extern int open_transformer(int src_fd, const char *transform_prog, ...);
+#define open_transformer(src_fd, transformer, transform_prog, ...) open_transformer(src_fd, transform_prog, __VA_ARGS__)
+#endif
 
 #endif