aboutsummaryrefslogtreecommitdiff
path: root/include/bb_archive.h
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2018-03-01 15:37:12 +0000
committerRon Yorston <rmy@pobox.com>2018-03-01 15:37:12 +0000
commit5b726f8a78c33e117c2a968739b1b4a6964905f8 (patch)
treeaf063c6bf3e99b7480c2fad2dffc2a76c09cb5e0 /include/bb_archive.h
parent5f8dac68690e92f0be220f8f8d9f797a2aedc806 (diff)
parentcc222747ae7e264cbe9b1c8a9c253860275db8a9 (diff)
downloadbusybox-w32-5b726f8a78c33e117c2a968739b1b4a6964905f8.tar.gz
busybox-w32-5b726f8a78c33e117c2a968739b1b4a6964905f8.tar.bz2
busybox-w32-5b726f8a78c33e117c2a968739b1b4a6964905f8.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'include/bb_archive.h')
-rw-r--r--include/bb_archive.h23
1 files changed, 14 insertions, 9 deletions
diff --git a/include/bb_archive.h b/include/bb_archive.h
index c67a299d1..8028736b8 100644
--- a/include/bb_archive.h
+++ b/include/bb_archive.h
@@ -74,6 +74,9 @@ typedef struct archive_handle_t {
74 /* Currently processed file's header */ 74 /* Currently processed file's header */
75 file_header_t *file_header; 75 file_header_t *file_header;
76 76
77 /* List of symlink placeholders */
78 llist_t *symlink_placeholders;
79
77 /* Process the header component, e.g. tar -t */ 80 /* Process the header component, e.g. tar -t */
78 void FAST_FUNC (*action_header)(const file_header_t *); 81 void FAST_FUNC (*action_header)(const file_header_t *);
79 82
@@ -129,15 +132,14 @@ typedef struct archive_handle_t {
129#define ARCHIVE_RESTORE_DATE (1 << 0) 132#define ARCHIVE_RESTORE_DATE (1 << 0)
130#define ARCHIVE_CREATE_LEADING_DIRS (1 << 1) 133#define ARCHIVE_CREATE_LEADING_DIRS (1 << 1)
131#define ARCHIVE_UNLINK_OLD (1 << 2) 134#define ARCHIVE_UNLINK_OLD (1 << 2)
132#define ARCHIVE_EXTRACT_QUIET (1 << 3) 135#define ARCHIVE_EXTRACT_NEWER (1 << 3)
133#define ARCHIVE_EXTRACT_NEWER (1 << 4) 136#define ARCHIVE_DONT_RESTORE_OWNER (1 << 4)
134#define ARCHIVE_DONT_RESTORE_OWNER (1 << 5) 137#define ARCHIVE_DONT_RESTORE_PERM (1 << 5)
135#define ARCHIVE_DONT_RESTORE_PERM (1 << 6) 138#define ARCHIVE_NUMERIC_OWNER (1 << 6)
136#define ARCHIVE_NUMERIC_OWNER (1 << 7) 139#define ARCHIVE_O_TRUNC (1 << 7)
137#define ARCHIVE_O_TRUNC (1 << 8) 140#define ARCHIVE_REMEMBER_NAMES (1 << 8)
138#define ARCHIVE_REMEMBER_NAMES (1 << 9)
139#if ENABLE_RPM 141#if ENABLE_RPM
140#define ARCHIVE_REPLACE_VIA_RENAME (1 << 10) 142#define ARCHIVE_REPLACE_VIA_RENAME (1 << 9)
141#endif 143#endif
142 144
143 145
@@ -207,7 +209,10 @@ void seek_by_jump(int fd, off_t amount) FAST_FUNC;
207void seek_by_read(int fd, off_t amount) FAST_FUNC; 209void seek_by_read(int fd, off_t amount) FAST_FUNC;
208 210
209const char *strip_unsafe_prefix(const char *str) FAST_FUNC; 211const char *strip_unsafe_prefix(const char *str) FAST_FUNC;
210int unsafe_symlink_target(const char *target) FAST_FUNC; 212void create_or_remember_symlink(llist_t **symlink_placeholders,
213 const char *target,
214 const char *linkname) FAST_FUNC;
215void create_symlinks_from_list(llist_t *list) FAST_FUNC;
211 216
212void data_align(archive_handle_t *archive_handle, unsigned boundary) FAST_FUNC; 217void data_align(archive_handle_t *archive_handle, unsigned boundary) FAST_FUNC;
213const llist_t *find_list_entry(const llist_t *list, const char *filename) FAST_FUNC; 218const llist_t *find_list_entry(const llist_t *list, const char *filename) FAST_FUNC;