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.

diff --git a/THANKS b/THANKS
index f1def93dd2f86c4eb72caf9d2a049396f341e259..5e8e8c9233741b1f681ab32912ef7ed4a52ecb46 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -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 7904148faee7df5cbaa06bbf047d1fc834ddae51..2b3244df4d99c2e4c23ac1a3a29dbd9a6de7d86f 100644 (file)
--- 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, &current_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, &current_mode,

diff --git a/tests/Makefile.am b/tests/Makefile.am
index fd38cb4f7df09b918b00cbc452c79199abbcacec..127d90b6ee483f2077e57bd580b643722faf3a1b 100644 (file)
--- 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 59ace0b6287582b9ba3b137587da25cd53c7a7d5..52e42eb23df233f3cac3c9a6a8dd59d9cf6e1599 100644 (file)
--- 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])