From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Tue, 29 Jun 2004 10:11:13 +0000 (+0000)
Subject: (extr_init): Save the device number
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=44391cb932218032536f4cd40baef46d686051d5;p=chaz%2Ftar

(extr_init): Save the device number
of the root device.
(extract_archive): Renamed gnu_restore() to purge_directory().
---

diff --git a/src/extract.c b/src/extract.c
index 0ed4153..65b9a35 100644
--- 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.  */
@@ -1012,7 +1025,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 ();