X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Funarchive.h;h=05ab0c16a88b3517ea9cb1b87a68ffc3507357ba;hb=277eb6bb444dd0f348079d7d37487f224c9abe39;hp=79ee99e37811bb2a5112f15d3d0d9fbf2faba8e9;hpb=2cd1eb16ad0131674251eeceed23298e29361d51;p=oweals%2Fbusybox.git

diff --git a/include/unarchive.h b/include/unarchive.h
index 79ee99e37..05ab0c16a 100644
--- a/include/unarchive.h
+++ b/include/unarchive.h
@@ -1,11 +1,14 @@
+/* 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>
@@ -23,11 +26,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 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;
@@ -37,7 +42,7 @@ typedef struct archive_handle_s {
 
 	/* 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 *);
 
@@ -56,7 +61,7 @@ typedef struct archive_handle_s {
 	/* Temporary storage */
 	char *buffer;
 
-	/* Misc. stuff */
+	/* Flags and misc. stuff */
 	unsigned char flags;
 
 } archive_handle_t;
@@ -85,23 +90,23 @@ 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 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 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);
 
 extern int open_transformer(int src_fd, int (*transformer)(int src_fd, int dst_fd));