diff options
| author | Pavel Raiskup <praiskup@redhat.com> | 2016-11-11 12:30:35 +0200 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2016-11-11 12:31:40 +0200 |
| commit | 597b0ae509fae849a7d8760b384ef64ca7621560 (patch) | |
| tree | f06963fee5db477f6e1fd77259ce7a96256393d6 | |
| parent | 21c1c295925e50b13eccd9a66ffefdcc63dfb86d (diff) | |
| download | tar-597b0ae509fae849a7d8760b384ef64ca7621560.tar.gz | |
don't set xattrs when --skip-old-files is used
* src/extract.c (set_xattr): Properly handle maybe_recoverable()
output. Throw warnings to not complicate caller.
(extract_file): Don't handle set_xattr's error.
* tests/xattr07.at: New testcase.
* tests/Makefile.am: Mention new testcase.
* tests/testsuite.at: Likewise.
* THANKS: Dawid.
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | src/extract.c | 43 | ||||
| -rw-r--r-- | tests/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/testsuite.at | 1 |
4 files changed, 30 insertions, 16 deletions
@@ -138,6 +138,7 @@ David Nugent davidn@blaze.net.au David Shaw david.shaw@alcatel.com.au David Steiner dsteiner@ispa.uni-osnabrueck.de David Taylor taylor@think.com +Dawid dpc@dpc.pw Dean Gaudet dgaudet@watdragon.uwaterloo.ca Demizu Noritoshi nori-d@is.aist-nara.ac.jp Denis Excoffier denis.excoffier@free.fr diff --git a/src/extract.c b/src/extract.c index 7904148f..2b3244df 100644 --- a/src/extract.c +++ b/src/extract.c @@ -795,13 +795,13 @@ maybe_recoverable (char *file_name, bool regular, bool *interdir_made) in advance dramatically improves the following performance of reading and writing a file). If not restoring permissions, invert the INVERT_PERMISSIONS bits from the file's current permissions. TYPEFLAG specifies the type of the - file. FILE_CREATED indicates set_xattr has created the file */ + file. Returns non-zero when error occurs (while un-available xattrs is not + an error, rather no-op). Non-zero FILE_CREATED indicates set_xattr has + created the file. */ static int set_xattr (char const *file_name, struct tar_stat_info const *st, mode_t invert_permissions, char typeflag, int *file_created) { - int status = 0; - #ifdef HAVE_XATTRS bool interdir_made = false; @@ -809,17 +809,32 @@ set_xattr (char const *file_name, struct tar_stat_info const *st, { mode_t mode = current_stat_info.stat.st_mode & MODE_RWX & ~ current_umask; - do - status = mknodat (chdir_fd, file_name, mode ^ invert_permissions, 0); - while (status && maybe_recoverable ((char *)file_name, false, - &interdir_made)); - - xattrs_xattrs_set (st, file_name, typeflag, 0); - *file_created = 1; + for (;;) + { + if (!mknodat (chdir_fd, file_name, mode ^ invert_permissions, 0)) + { + /* Successfully created file */ + xattrs_xattrs_set (st, file_name, typeflag, 0); + *file_created = 1; + return 0; + } + + switch (maybe_recoverable ((char *)file_name, false, &interdir_made)) + { + case RECOVER_OK: + continue; + case RECOVER_NO: + skip_member (); + open_error (file_name); + return 1; + case RECOVER_SKIP: + return 0; + } + } } #endif - return(status); + return 0; } /* Fix the statuses of all directories whose statuses need fixing, and @@ -1136,11 +1151,7 @@ extract_file (char *file_name, int typeflag) int file_created = 0; if (set_xattr (file_name, ¤t_stat_info, invert_permissions, typeflag, &file_created)) - { - skip_member (); - open_error (file_name); - return 1; - } + return 1; while ((fd = open_output_file (file_name, typeflag, mode, file_created, ¤t_mode, diff --git a/tests/Makefile.am b/tests/Makefile.am index fd38cb4f..127d90b6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -248,6 +248,7 @@ TESTSUITE_AT = \ xattr04.at\ xattr05.at\ xattr06.at\ + xattr07.at\ acls01.at\ acls02.at\ acls03.at\ diff --git a/tests/testsuite.at b/tests/testsuite.at index 59ace0b6..52e42eb2 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -447,6 +447,7 @@ m4_include([xattr03.at]) m4_include([xattr04.at]) m4_include([xattr05.at]) m4_include([xattr06.at]) +m4_include([xattr07.at]) m4_include([acls01.at]) m4_include([acls02.at]) |