X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Funarchive.h;h=36b56a925d8938f0ad7031a9e12458701fcf2b71;hb=fe42d17318fffed53f02617fd668d896000bdd28;hp=a1010aae850cf450b8435458b79bb5d59605dc33;hpb=8e940984231a5baf98b6e2a637477dd701d314a9;p=oweals%2Fbusybox.git diff --git a/include/unarchive.h b/include/unarchive.h index a1010aae8..36b56a925 100644 --- a/include/unarchive.h +++ b/include/unarchive.h @@ -1,14 +1,16 @@ +/* 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_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 - -#include +#include "libbb.h" typedef struct file_headers_s { char *name; @@ -21,17 +23,14 @@ 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 struct archive_handle_s *); - const llist_t *accept; - const llist_t *reject; - const llist_t *passed; /* List of files that have successfully been worked on */ + /* 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; + /* List of files that have successfully been worked on */ + llist_t *passed; /* Contains the processed header entry */ file_header_t *file_header; @@ -39,8 +38,10 @@ 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 */ char (*action_data_subarchive)(struct archive_handle_s *); /* Contains the handle to a sub archive */ @@ -52,25 +53,24 @@ 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 */ + /* Flags and misc. stuff */ unsigned char flags; } archive_handle_t; + extern archive_handle_t *init_handle(void); -extern char filter_accept_all(const archive_handle_t *archive_handle); -extern char filter_accept_list(const archive_handle_t *archive_handle); -extern char filter_accept_reject_list(const archive_handle_t *archive_handle); +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); @@ -83,28 +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_trailer_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 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 const llist_t *add_to_list(const llist_t *old_head, const char *new_item); -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 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); + +typedef struct inflate_unzip_result { + off_t bytes_out; + uint32_t crc; +} inflate_unzip_result; + +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 ssize_t read_bz2(int fd, void *buf, size_t count); -extern void BZ2_bzReadOpen(int fd, void *unused, int nUnused); -extern unsigned char uncompressStream(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