X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=archival%2Ftar.c;h=03d66a6929e9e8b2dc8ecca730c6039c0c162d11;hb=8b814b4a349e2262c0ad25793b05206a14651ebb;hp=76f1a6240c1c62ff73b5530afd1732d6be37ab2b;hpb=ab6b446e9567db741b463f74afb7d98cc583c4b9;p=oweals%2Fbusybox.git diff --git a/archival/tar.c b/archival/tar.c index 76f1a6240..03d66a692 100644 --- a/archival/tar.c +++ b/archival/tar.c @@ -592,8 +592,6 @@ static NOINLINE int writeTarFile(int tar_fd, int verboseFlag, struct TarBallInfo tbInfo; tbInfo.hlInfoHead = NULL; - - fchmod(tar_fd, 0644); tbInfo.tarFd = tar_fd; tbInfo.verboseFlag = verboseFlag; @@ -740,6 +738,7 @@ enum { USE_FEATURE_SEAMLESS_Z( OPTBIT_COMPRESS ,) OPTBIT_NOPRESERVE_OWN, OPTBIT_NOPRESERVE_PERM, + OPTBIT_NUMERIC_OWNER, OPT_TEST = 1 << 0, // t OPT_EXTRACT = 1 << 1, // x OPT_BASEDIR = 1 << 2, // C @@ -758,6 +757,7 @@ enum { OPT_COMPRESS = USE_FEATURE_SEAMLESS_Z( (1 << OPTBIT_COMPRESS )) + 0, // Z OPT_NOPRESERVE_OWN = 1 << OPTBIT_NOPRESERVE_OWN , // no-same-owner OPT_NOPRESERVE_PERM = 1 << OPTBIT_NOPRESERVE_PERM, // no-same-permissions + OPT_NUMERIC_OWNER = 1 << OPTBIT_NUMERIC_OWNER, }; #if ENABLE_FEATURE_TAR_LONG_OPTIONS static const char tar_longopts[] ALIGN1 = @@ -789,6 +789,7 @@ static const char tar_longopts[] ALIGN1 = # if ENABLE_FEATURE_SEAMLESS_Z "compress\0" No_argument "Z" # endif + "numeric-owner\0" No_argument "\xfc" "no-same-owner\0" No_argument "\xfd" "no-same-permissions\0" No_argument "\xfe" /* --exclude takes next bit position in option mask, */ @@ -875,6 +876,9 @@ int tar_main(int argc UNUSED_PARAM, char **argv) if (opt & OPT_NOPRESERVE_PERM) tar_handle->ah_flags |= ARCHIVE_NOPRESERVE_PERM; + if (opt & OPT_NUMERIC_OWNER) + tar_handle->ah_flags |= ARCHIVE_NUMERIC_OWNER; + if (opt & OPT_GZIP) get_header_ptr = get_header_tar_gz;