diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2015-10-22 13:38:09 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2015-10-22 13:38:09 +0200 |
| commit | 537389cedd3acaf658c73ec4e36a40db00a5a92f (patch) | |
| tree | 9cf5b9f6ce4b50b72dadebd1b2e98bd0cefd60ba | |
| parent | f167e4503d08561054e75deb2ff123be2b30afa5 (diff) | |
| download | busybox-w32-537389cedd3acaf658c73ec4e36a40db00a5a92f.tar.gz busybox-w32-537389cedd3acaf658c73ec4e36a40db00a5a92f.tar.bz2 busybox-w32-537389cedd3acaf658c73ec4e36a40db00a5a92f.zip | |
tar: fix files skipped with --strip_components not resetting selinux context
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | archival/libarchive/data_extract_all.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/archival/libarchive/data_extract_all.c b/archival/libarchive/data_extract_all.c index cf821c9de..bd034afdc 100644 --- a/archival/libarchive/data_extract_all.c +++ b/archival/libarchive/data_extract_all.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | 8 | ||
| 9 | void FAST_FUNC data_extract_all(archive_handle_t *archive_handle) | 9 | void FAST_FUNC data_extract_all(archive_handle_t *archive_handle) |
| 10 | { | 10 | { |
| 11 | |||
| 12 | file_header_t *file_header = archive_handle->file_header; | 11 | file_header_t *file_header = archive_handle->file_header; |
| 13 | int dst_fd; | 12 | int dst_fd; |
| 14 | int res; | 13 | int res; |
| @@ -44,7 +43,7 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle) | |||
| 44 | dst_name = strchr(dst_name, '/'); | 43 | dst_name = strchr(dst_name, '/'); |
| 45 | if (!dst_name || dst_name[1] == '\0') { | 44 | if (!dst_name || dst_name[1] == '\0') { |
| 46 | data_skip(archive_handle); | 45 | data_skip(archive_handle); |
| 47 | return; | 46 | goto ret; |
| 48 | } | 47 | } |
| 49 | dst_name++; | 48 | dst_name++; |
| 50 | /* | 49 | /* |
| @@ -60,7 +59,7 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle) | |||
| 60 | hard_link = strchr(hard_link, '/'); | 59 | hard_link = strchr(hard_link, '/'); |
| 61 | if (!hard_link || hard_link[1] == '\0') { | 60 | if (!hard_link || hard_link[1] == '\0') { |
| 62 | data_skip(archive_handle); | 61 | data_skip(archive_handle); |
| 63 | return; | 62 | goto ret; |
| 64 | } | 63 | } |
| 65 | hard_link++; | 64 | hard_link++; |
| 66 | } | 65 | } |
