diff options
| author | J. Tang | 2010-03-19 14:48:51 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2010-03-19 14:48:51 +0100 |
| commit | 77a2c51e79eb54c8f5cc8903465223cbac6e8d50 (patch) | |
| tree | 932aff055f4e16da85fe2dbb0c02404407077799 /archival/libunarchive/data_extract_all.c | |
| parent | bcda0042e2313d65a835b874c78bf215d743a844 (diff) | |
| download | busybox-77a2c51e79eb54c8f5cc8903465223cbac6e8d50.zip busybox-77a2c51e79eb54c8f5cc8903465223cbac6e8d50.tar.gz | |
tar: optional support for restoring selinux context
function old new delta
get_header_tar 1690 1976 +286
data_extract_all 821 881 +60
.rodata 151446 151503 +57
get_header_cpio 1044 1077 +33
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 4/0 up/down: 436/0) Total: 436 bytes
Signed-off-by: J. Tang <tang@jtang.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'archival/libunarchive/data_extract_all.c')
| -rw-r--r-- | archival/libunarchive/data_extract_all.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/archival/libunarchive/data_extract_all.c b/archival/libunarchive/data_extract_all.c index 58b0533..cc48942 100644 --- a/archival/libunarchive/data_extract_all.c +++ b/archival/libunarchive/data_extract_all.c @@ -12,6 +12,17 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle) int dst_fd; int res; +#if ENABLE_FEATURE_TAR_SELINUX + char *sctx = archive_handle->tar__next_file_sctx; + if (!sctx) + sctx = archive_handle->tar__global_sctx; + if (sctx) { /* setfscreatecon is 4 syscalls, avoid if possible */ + setfscreatecon(sctx); + free(archive_handle->tar__next_file_sctx); + archive_handle->tar__next_file_sctx = NULL; + } +#endif + if (archive_handle->ah_flags & ARCHIVE_CREATE_LEADING_DIRS) { char *slash = strrchr(file_header->name, '/'); if (slash) { @@ -45,7 +56,7 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle) "same age file exists", file_header->name); } data_skip(archive_handle); - return; + goto ret; } else if ((unlink(file_header->name) == -1) && (errno != EISDIR)) { bb_perror_msg_and_die("can't remove old file %s", @@ -158,4 +169,12 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle) utimes(file_header->name, t); } } + + ret: ; +#if ENABLE_FEATURE_TAR_SELINUX + if (sctx) { + /* reset the context after creating an entry */ + setfscreatecon(NULL); + } +#endif } |