X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fextract.c;h=859146cab39596ade8449693f1b7dbd235b36170;hb=1689ed43885c8418c29d1365ae3a06450a460830;hp=3d8ba10dbf539f50e3407eb0b56e8dd47213b997;hpb=28b44aaacb45680aa6640e0a6d7ceab04cfdbf11;p=chaz%2Ftar

diff --git a/src/extract.c b/src/extract.c
index 3d8ba10..859146c 100644
--- a/src/extract.c
+++ b/src/extract.c
@@ -191,6 +191,19 @@ extr_init (void)
       umask (newdir_umask);	/* restore the kernel umask */
       current_umask = newdir_umask;
     }
+
+  /* If the user wants to guarantee that everything is under one directory,
+     determine its name now and let it be created later.  */
+  if (one_top_level_option && !one_top_level_dir)
+    {
+      char *base = base_name (archive_name_array[0]);
+
+      one_top_level_dir = strip_compression_suffix (base);
+      free (base);
+      
+      if (!one_top_level_dir)
+	USAGE_ERROR ((0, 0, _("Cannot deduce top-level directory name; please set it explicitly with --one-top-level=DIR")));
+    }
 }
 
 /* Use fchmod if possible, fchmodat otherwise.  */
@@ -855,7 +868,21 @@ apply_nonancestor_delayed_set_stat (char const *file_name, bool after_links)
 }
 
 
-
+static bool
+is_directory_link (const char *file_name)
+{
+  struct stat st;
+  int e = errno;
+  int res;
+  
+  res = (fstatat (chdir_fd, file_name, &st, AT_SYMLINK_NOFOLLOW) == 0 &&
+	 S_ISLNK (st.st_mode) &&
+	 fstatat (chdir_fd, file_name, &st, 0) == 0 &&
+	 S_ISDIR (st.st_mode));
+  errno = e;
+  return res;
+}
+
 /* Extractor functions for various member types */
 
 static int
@@ -911,10 +938,15 @@ extract_dir (char *file_name, int typeflag)
 
       if (errno == EEXIST
 	  && (interdir_made
+	      || keep_directory_symlink_option
 	      || old_files_option == DEFAULT_OLD_FILES
 	      || old_files_option == OVERWRITE_OLD_FILES))
 	{
 	  struct stat st;
+
+	  if (keep_directory_symlink_option && is_directory_link (file_name))
+	    return 0;
+	  
 	  if (deref_stat (file_name, &st) == 0)
 	    {
 	      current_mode = st.st_mode;