Include extrac06.at

[chaz/tar] / src / extract.c

diff --git a/src/extract.c b/src/extract.c
index c01c88d12b58d10749d4a0a6b848c7d7a6c0765c..408208392ab64a69afd7a116c4c12960117ba5f2 100644 (file)
--- a/src/extract.c
+++ b/src/extract.c
@@ -1,7 +1,7 @@
 /* Extract files from a tar archive.
 
    Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1998, 1999, 2000,
-   2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+   2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
    Written by John Gilmore, on 1985-11-19.
 
@@ -428,7 +428,7 @@ make_directories (char *file_name)
             invert_permissions is zero, because
             repair_delayed_set_stat may need to update the struct.  */
          delay_set_stat (file_name,
-                         &current_stat_info /* ignored */,
+                         &current_stat_info,
                          invert_permissions, INTERDIR_PERMSTATUS);
 
          print_for_mkdir (file_name, cursor - file_name, mode);
@@ -647,7 +647,7 @@ extract_dir (char *file_name, int typeflag)
                }
              if (S_ISDIR (st.st_mode))
                {
-                 mode = st.st_mode & ~ current_umask;
+                 mode = st.st_mode;
                  break;
                }
            }
@@ -668,12 +668,16 @@ extract_dir (char *file_name, int typeflag)
   if (status == 0
       || old_files_option == DEFAULT_OLD_FILES
       || old_files_option == OVERWRITE_OLD_FILES)
-    delay_set_stat (file_name, &current_stat_info,
-                   MODE_RWX & (mode ^ current_stat_info.stat.st_mode),
-                   (status == 0
-                    ? ARCHIVED_PERMSTATUS
-                    : UNKNOWN_PERMSTATUS));
-
+    {
+      if (status == 0)
+       delay_set_stat (file_name, &current_stat_info,
+                       MODE_RWX & (mode ^ current_stat_info.stat.st_mode),
+                       ARCHIVED_PERMSTATUS);
+      else /* For an already existing directory, invert_perms must be 0 */
+       delay_set_stat (file_name, &current_stat_info,
+                       0,
+                       UNKNOWN_PERMSTATUS);
+    }
   return status;
 }
 
@@ -759,26 +763,26 @@ extract_file (char *file_name, int typeflag)
     for (size = current_stat_info.stat.st_size; size > 0; )
       {
        mv_size_left (size);
-       
+
        /* Locate data, determine max length writeable, write it,
           block that we have used the data, then check if the write
           worked.  */
-       
+
        data_block = find_next_block ();
        if (! data_block)
          {
            ERROR ((0, 0, _("Unexpected EOF in archive")));
            break;              /* FIXME: What happens, then?  */
          }
-       
+
        written = available_space_after (data_block);
-       
+
        if (written > size)
          written = size;
        errno = 0;
        count = full_write (fd, data_block->buffer, written);
        size -= written;
-       
+
        set_next_block_after ((union block *)
                              (data_block->buffer + written - 1));
        if (count != written)
@@ -793,7 +797,7 @@ extract_file (char *file_name, int typeflag)
   skip_file (size);
 
   mv_end ();
-  
+
   /* If writing to stdout, don't try to do anything to the filename;
      it doesn't exist, or we don't want to touch it anyway.  */
 
@@ -1210,7 +1214,7 @@ extract_archive (void)
      (see NOTICE in the comment to delay_set_stat above) */
   if (!delay_directory_restore_option)
     apply_nonancestor_delayed_set_stat (file_name, 0);
-      
+
   /* Take a safety backup of a previously existing file.  */
 
   if (backup_option)