Comaptability with gcc-2.95

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

diff --git a/include/unarchive.h b/include/unarchive.h
index bfd9a1458e4f5f8d73f31156ecee7526ce9cca60..1c4e851ab1a34a98e39476460a8aa250986e660a 100644 (file)
--- a/include/unarchive.h
+++ b/include/unarchive.h
@@ -5,10 +5,11 @@
 #define ARCHIVE_CREATE_LEADING_DIRS            2
 #define ARCHIVE_EXTRACT_UNCONDITIONAL  4
 #define ARCHIVE_EXTRACT_QUIET  8
+#define ARCHIVE_EXTRACT_NEWER  16
 
 #include <sys/types.h>
-
 #include <stdio.h>
+#include "libbb.h"
 
 typedef struct file_headers_s {
        char *name;
@@ -21,17 +22,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)(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 */
+       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;
@@ -90,6 +86,7 @@ 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);
@@ -103,7 +100,6 @@ extern void archive_xread_all(const archive_handle_t *archive_handle, void *buf,
 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);