(extract_archive): Do not report an error

[chaz/tar] / src / extract.c

diff --git a/src/extract.c b/src/extract.c
index 0ed41532592c683bec9a905e2ad749bf6c080957..49ed02908ff62715c68536830d866416af656b20 100644 (file)
--- a/src/extract.c
+++ b/src/extract.c
@@ -115,6 +115,19 @@ extr_init (void)
   same_owner_option += we_are_root;
   xalloc_fail_func = extract_finish;
 
+  /* Save 'root device' to avoid purging mount points.
+     FIXME: Should the same be done after handling -C option ? */
+  if (one_file_system_option)
+    {
+      struct stat st;      
+      char *dir = xgetcwd ();
+
+      if (deref_stat (true, dir, &st))
+       stat_diag (dir);
+      else
+       root_device = st.st_dev;
+    }
+  
   /* Option -p clears the kernel umask, so it does not affect proper
      restoration of file permissions.  New intermediate directories will
      comply with umask at start of program.  */
@@ -912,11 +925,12 @@ extract_archive (void)
        /* MSDOS does not implement links.  However, djgpp's link() actually
           copies the file.  */
        status = link (link_name, file_name);
+       e = errno;
 
        if (status == 0)
          {
            struct delayed_symlink *ds = delayed_symlink_head;
-           if (ds && stat (link_name, &st1) == 0)
+           if (ds && lstat (link_name, &st1) == 0)
              for (; ds; ds = ds->next)
                if (ds->dev == st1.st_dev
                    && ds->ino == st1.st_ino
@@ -932,17 +946,20 @@ extract_archive (void)
                  }
            break;
          }
+
+       if ((e == EEXIST && strcmp (link_name, file_name) == 0)
+           || (lstat (link_name, &st1) == 0
+               && lstat (file_name, &st2) == 0
+               && st1.st_dev == st2.st_dev
+               && st1.st_ino == st2.st_ino))
+         break;
+
+       errno = e;
        if (maybe_recoverable (file_name, &interdir_made))
          goto again_link;
 
        if (incremental_option && errno == EEXIST)
          break;
-       e = errno;
-       if (stat (link_name, &st1) == 0
-           && stat (file_name, &st2) == 0
-           && st1.st_dev == st2.st_dev
-           && st1.st_ino == st2.st_ino)
-         break;
 
        link_error (link_name, file_name);
        if (backup_option)
@@ -1012,7 +1029,7 @@ extract_archive (void)
          /* Read the entry and delete files that aren't listed in the
             archive.  */
 
-         gnu_restore (file_name);
+         purge_directory (file_name);
        }
       else if (typeflag == GNUTYPE_DUMPDIR)
        skip_member ();