X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fextract.c;h=5b12ed1763b72875bf5b8df83fe936f12ad7e25f;hb=d7db30d0e80997b15cd3c976f612b08d95d091e9;hp=653e2a0d2f879f4bf95442275928ba69a4d129cb;hpb=3b219f943e6b0b14c8f30176951b9339ae3ebaf4;p=chaz%2Ftar

diff --git a/src/extract.c b/src/extract.c
index 653e2a0..5b12ed1 100644
--- a/src/extract.c
+++ b/src/extract.c
@@ -69,6 +69,7 @@ struct delayed_set_stat
     mode_t invert_permissions;
     enum permstatus permstatus;
     bool after_links;
+    int change_dir;
     char file_name[1];
   };
 
@@ -80,10 +81,12 @@ struct delayed_link
     /* The next delayed link in the list.  */
     struct delayed_link *next;
 
-    /* The device, inode number and last-modified time of the placeholder.  */
+    /* The device, inode number and ctime of the placeholder.  Use
+       ctime, not mtime, to make false matches less likely if some
+       other process removes the placeholder.  */
     dev_t dev;
     ino_t ino;
-    struct timespec mtime;
+    struct timespec ctime;
 
     /* True if the link is symbolic.  */
     bool is_symlink;
@@ -92,6 +95,9 @@ struct delayed_link
     uid_t uid;
     gid_t gid;
 
+    /* The directory that the sources and target are relative to.  */
+    int change_dir;
+
     /* A list of sources for this link.  The sources are all to be
        hard-linked together.  */
     struct string_list *sources;
@@ -371,6 +377,7 @@ delay_set_stat (char const *file_name, struct tar_stat_info const *st,
   data->invert_permissions = invert_permissions;
   data->permstatus = permstatus;
   data->after_links = 0;
+  data->change_dir = chdir_current;
   strcpy (data->file_name, file_name);
   delayed_set_stat_head = data;
 }
@@ -604,6 +611,8 @@ apply_nonancestor_delayed_set_stat (char const *file_name, bool after_links)
 	      && memcmp (file_name, data->file_name, data->file_name_len) == 0))
 	break;
 
+      chdir_do (data->change_dir);
+
       if (check_for_renamed_directories)
 	{
 	  cur_info = &st;
@@ -924,13 +933,14 @@ create_placeholder_file (char *file_name, bool is_symlink, bool *interdir_made)
       delayed_link_head = p;
       p->dev = st.st_dev;
       p->ino = st.st_ino;
-      p->mtime = get_stat_mtime (&st);
+      p->ctime = get_stat_ctime (&st);
       p->is_symlink = is_symlink;
       if (is_symlink)
 	{
 	  p->uid = current_stat_info.stat.st_uid;
 	  p->gid = current_stat_info.stat.st_gid;
 	}
+      p->change_dir = chdir_current;
       p->sources = xmalloc (offsetof (struct string_list, string)
 			    + strlen (file_name) + 1);
       p->sources->next = 0;
@@ -988,9 +998,10 @@ extract_link (char *file_name, int typeflag)
 	  struct delayed_link *ds = delayed_link_head;
 	  if (ds && lstat (link_name, &st1) == 0)
 	    for (; ds; ds = ds->next)
-	      if (ds->dev == st1.st_dev
+	      if (ds->change_dir == chdir_current
+		  && ds->dev == st1.st_dev
 		  && ds->ino == st1.st_ino
-		  && timespec_cmp (ds->mtime, get_stat_mtime (&st1)) == 0)
+		  && timespec_cmp (ds->ctime, get_stat_ctime (&st1)) == 0)
 		{
 		  struct string_list *p =  xmalloc (offsetof (struct string_list, string)
 						    + strlen (file_name) + 1);
@@ -1295,7 +1306,11 @@ extract_archive (void)
      it is an incremental archive.
      (see NOTICE in the comment to delay_set_stat above) */
   if (!delay_directory_restore_option)
-    apply_nonancestor_delayed_set_stat (current_stat_info.file_name, 0);
+    {
+      int dir = chdir_current;
+      apply_nonancestor_delayed_set_stat (current_stat_info.file_name, 0);
+      chdir_do (dir);
+    }
 
   /* Take a safety backup of a previously existing file.  */
 
@@ -1325,7 +1340,7 @@ extract_archive (void)
 
 }
 
-/* Extract the symbolic links whose final extraction were delayed.  */
+/* Extract the links whose final extraction were delayed.  */
 static void
 apply_delayed_links (void)
 {
@@ -1336,6 +1351,8 @@ apply_delayed_links (void)
       struct string_list *sources = ds->sources;
       char const *valid_source = 0;
 
+      chdir_do (ds->change_dir);
+
       for (sources = ds->sources; sources; sources = sources->next)
 	{
 	  char const *source = sources->string;
@@ -1347,7 +1364,7 @@ apply_delayed_links (void)
 	  if (lstat (source, &st) == 0
 	      && st.st_dev == ds->dev
 	      && st.st_ino == ds->ino
-	      && timespec_cmp (get_stat_mtime (&st), ds->mtime) == 0)
+	      && timespec_cmp (get_stat_ctime (&st), ds->ctime) == 0)
 	    {
 	      /* Unlink the placeholder, then create a hard link if possible,
 		 a symbolic link otherwise.  */