diff options
| author | Ron Yorston <rmy@pobox.com> | 2018-03-01 15:37:12 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2018-03-01 15:37:12 +0000 |
| commit | 5b726f8a78c33e117c2a968739b1b4a6964905f8 (patch) | |
| tree | af063c6bf3e99b7480c2fad2dffc2a76c09cb5e0 /include | |
| parent | 5f8dac68690e92f0be220f8f8d9f797a2aedc806 (diff) | |
| parent | cc222747ae7e264cbe9b1c8a9c253860275db8a9 (diff) | |
| download | busybox-w32-5b726f8a78c33e117c2a968739b1b4a6964905f8.tar.gz busybox-w32-5b726f8a78c33e117c2a968739b1b4a6964905f8.tar.bz2 busybox-w32-5b726f8a78c33e117c2a968739b1b4a6964905f8.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/bb_archive.h | 23 | ||||
| -rw-r--r-- | include/libbb.h | 6 |
2 files changed, 17 insertions, 12 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; | |||
| 207 | void seek_by_read(int fd, off_t amount) FAST_FUNC; | 209 | void seek_by_read(int fd, off_t amount) FAST_FUNC; |
| 208 | 210 | ||
| 209 | const char *strip_unsafe_prefix(const char *str) FAST_FUNC; | 211 | const char *strip_unsafe_prefix(const char *str) FAST_FUNC; |
| 210 | int unsafe_symlink_target(const char *target) FAST_FUNC; | 212 | void create_or_remember_symlink(llist_t **symlink_placeholders, |
| 213 | const char *target, | ||
| 214 | const char *linkname) FAST_FUNC; | ||
| 215 | void create_symlinks_from_list(llist_t *list) FAST_FUNC; | ||
| 211 | 216 | ||
| 212 | void data_align(archive_handle_t *archive_handle, unsigned boundary) FAST_FUNC; | 217 | void data_align(archive_handle_t *archive_handle, unsigned boundary) FAST_FUNC; |
| 213 | const llist_t *find_list_entry(const llist_t *list, const char *filename) FAST_FUNC; | 218 | const llist_t *find_list_entry(const llist_t *list, const char *filename) FAST_FUNC; |
diff --git a/include/libbb.h b/include/libbb.h index 4a59ee7d8..f8e54de54 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
| @@ -1536,6 +1536,7 @@ extern void run_shell(const char *shell, int loginshell, const char **args) NORE | |||
| 1536 | */ | 1536 | */ |
| 1537 | const char *get_shell_name(void) FAST_FUNC; | 1537 | const char *get_shell_name(void) FAST_FUNC; |
| 1538 | 1538 | ||
| 1539 | #if ENABLE_FEATURE_SETPRIV_CAPABILITIES || ENABLE_RUN_INIT | ||
| 1539 | unsigned cap_name_to_number(const char *cap) FAST_FUNC; | 1540 | unsigned cap_name_to_number(const char *cap) FAST_FUNC; |
| 1540 | void printf_cap(const char *pfx, unsigned cap_no) FAST_FUNC; | 1541 | void printf_cap(const char *pfx, unsigned cap_no) FAST_FUNC; |
| 1541 | void drop_capability(int cap_ordinal) FAST_FUNC; | 1542 | void drop_capability(int cap_ordinal) FAST_FUNC; |
| @@ -1547,9 +1548,7 @@ struct caps { \ | |||
| 1547 | struct __user_cap_data_struct data[2]; \ | 1548 | struct __user_cap_data_struct data[2]; \ |
| 1548 | } | 1549 | } |
| 1549 | void getcaps(void *caps) FAST_FUNC; | 1550 | void getcaps(void *caps) FAST_FUNC; |
| 1550 | 1551 | #endif | |
| 1551 | unsigned cap_name_to_number(const char *name) FAST_FUNC; | ||
| 1552 | void printf_cap(const char *pfx, unsigned cap_no) FAST_FUNC; | ||
| 1553 | 1552 | ||
| 1554 | #if ENABLE_SELINUX | 1553 | #if ENABLE_SELINUX |
| 1555 | extern void renew_current_security_context(void) FAST_FUNC; | 1554 | extern void renew_current_security_context(void) FAST_FUNC; |
| @@ -2006,6 +2005,7 @@ typedef struct bb_progress_t { | |||
| 2006 | unsigned last_update_sec; | 2005 | unsigned last_update_sec; |
| 2007 | unsigned last_change_sec; | 2006 | unsigned last_change_sec; |
| 2008 | unsigned start_sec; | 2007 | unsigned start_sec; |
| 2008 | /*unsigned last_eta;*/ | ||
| 2009 | const char *curfile; | 2009 | const char *curfile; |
| 2010 | } bb_progress_t; | 2010 | } bb_progress_t; |
| 2011 | 2011 | ||