(exclusion_tag_warning, check_exclusion_tags): Remove static qualifier.

[chaz/tar] / src / extract.c

diff --git a/src/extract.c b/src/extract.c
index 80f2f9ceec68d1616d311680c6537e30cb83b348..0d938e63798a1142a1b7253bd415aa8f94d14b52 100644 (file)
--- a/src/extract.c
+++ b/src/extract.c
@@ -1,13 +1,13 @@
 /* Extract files from a tar archive.
 
    Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1998, 1999, 2000,
 /* 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, 2007 Free Software Foundation, Inc.

 
    Written by John Gilmore, on 1985-11-19.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
 
    Written by John Gilmore, on 1985-11-19.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the

-   Free Software Foundation; either version 2, or (at your option) any later
+   Free Software Foundation; either version 3, or (at your option) any later

    version.
 
    This program is distributed in the hope that it will be useful, but
    version.
 
    This program is distributed in the hope that it will be useful, but


@@ -37,7 +37,8 @@ enum permstatus
   /* This file may have existed already; its permissions are unknown.  */
   UNKNOWN_PERMSTATUS,
 
   /* This file may have existed already; its permissions are unknown.  */
   UNKNOWN_PERMSTATUS,
 

-  /* This file was created using the permissions from the archive.  */
+  /* This file was created using the permissions from the archive,
+     except with S_IRWXG | S_IRWXO masked out if 0 < same_owner_option.  */

   ARCHIVED_PERMSTATUS,
 
   /* This is an intermediate directory; the archive did not specify
   ARCHIVED_PERMSTATUS,
 
   /* This is an intermediate directory; the archive did not specify


@@ -57,7 +58,13 @@ enum permstatus
 struct delayed_set_stat
   {
     struct delayed_set_stat *next;
 struct delayed_set_stat
   {
     struct delayed_set_stat *next;

-    struct stat stat_info;
+    dev_t dev;
+    ino_t ino;
+    mode_t mode;
+    uid_t uid;
+    gid_t gid;
+    struct timespec atime;
+    struct timespec mtime;

     size_t file_name_len;
     mode_t invert_permissions;
     enum permstatus permstatus;
     size_t file_name_len;
     mode_t invert_permissions;
     enum permstatus permstatus;


@@ -76,7 +83,7 @@ struct delayed_link
     /* The device, inode number and last-modified time of the placeholder.  */
     dev_t dev;
     ino_t ino;
     /* The device, inode number and last-modified time of the placeholder.  */
     dev_t dev;
     ino_t ino;

-    time_t mtime;
+    struct timespec mtime;

 
     /* True if the link is symbolic.  */
     bool is_symlink;
 
     /* True if the link is symbolic.  */
     bool is_symlink;


@@ -109,19 +116,6 @@ extr_init (void)
   same_permissions_option += we_are_root;
   same_owner_option += we_are_root;
 
   same_permissions_option += we_are_root;
   same_owner_option += we_are_root;
 

-  /* 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.  */
   /* 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.  */


@@ -156,12 +150,15 @@ set_mode (char const *file_name,
     {
       mode = stat_info->st_mode;
 
     {
       mode = stat_info->st_mode;
 

-      /* If we created the file and it has a usual mode, then its mode
-        is normally set correctly already.  But on many hosts, some
+      /* If we created the file and it has a mode that we set already
+        with O_CREAT, then its mode is often set correctly already.
+        But if we are changing ownership, the mode's group and and
+        other permission bits were omitted originally, so it's less
+        likely that the mode is OK now.  Also, on many hosts, some

         directories inherit the setgid bits from their parents, so we
         we must set directories' modes explicitly.  */
         directories inherit the setgid bits from their parents, so we
         we must set directories' modes explicitly.  */

-      if (permstatus == ARCHIVED_PERMSTATUS
-         && ! (mode & ~ MODE_RWX)
+      if ((permstatus == ARCHIVED_PERMSTATUS
+          && ! (mode & ~ (0 < same_owner_option ? S_IRWXU : MODE_RWX)))

          && typeflag != DIRTYPE
          && typeflag != GNUTYPE_DUMPDIR)
        return;
          && typeflag != DIRTYPE
          && typeflag != GNUTYPE_DUMPDIR)
        return;


@@ -200,31 +197,31 @@ check_time (char const *file_name, struct timespec t)
   if (t.tv_sec <= 0)
     WARN ((0, 0, _("%s: implausibly old time stamp %s"),
           file_name, tartime (t, true)));
   if (t.tv_sec <= 0)
     WARN ((0, 0, _("%s: implausibly old time stamp %s"),
           file_name, tartime (t, true)));

-  else if (timespec_cmp (start_time, t) < 0)
+  else if (timespec_cmp (volume_start_time, t) < 0)

     {
       struct timespec now;
       gettime (&now);
       if (timespec_cmp (now, t) < 0)
        {
     {
       struct timespec now;
       gettime (&now);
       if (timespec_cmp (now, t) < 0)
        {

-         unsigned long int ds = t.tv_sec - now.tv_sec;
-         int dns = t.tv_nsec - now.tv_nsec;
-         char dnsbuf[sizeof ".FFFFFFFFF"];
-         if (dns < 0)
+         char buf[TIMESPEC_STRSIZE_BOUND];
+         struct timespec diff;
+         diff.tv_sec = t.tv_sec - now.tv_sec;
+         diff.tv_nsec = t.tv_nsec - now.tv_nsec;
+         if (diff.tv_nsec < 0)

            {
            {

-             dns += 1000000000;
-             ds--;
+             diff.tv_nsec += BILLION;
+             diff.tv_sec--;

            }
            }

-         code_ns_fraction (dns, dnsbuf);
-         WARN ((0, 0, _("%s: time stamp %s is %lu%s s in the future"),
-                file_name, tartime (t, true), ds, dnsbuf));
+         WARN ((0, 0, _("%s: time stamp %s is %s s in the future"),
+                file_name, tartime (t, true), code_timespec (diff, buf)));

        }
     }
 }
 
 /* Restore stat attributes (owner, group, mode and times) for
        }
     }
 }
 
 /* Restore stat attributes (owner, group, mode and times) for

-   FILE_NAME, using information given in *STAT_INFO.
+   FILE_NAME, using information given in *ST.

    If CUR_INFO is nonzero, *CUR_INFO is the
    If CUR_INFO is nonzero, *CUR_INFO is the

-   file's currernt status.
+   file's current status.

    If not restoring permissions, invert the
    INVERT_PERMISSIONS bits from the file's current permissions.
    PERMSTATUS specifies the status of the file's permissions.
    If not restoring permissions, invert the
    INVERT_PERMISSIONS bits from the file's current permissions.
    PERMSTATUS specifies the status of the file's permissions.


@@ -237,7 +234,7 @@ check_time (char const *file_name, struct timespec t)
 
 static void
 set_stat (char const *file_name,
 
 static void
 set_stat (char const *file_name,

-         struct stat const *stat_info,
+         struct tar_stat_info const *st,

          struct stat const *cur_info,
          mode_t invert_permissions, enum permstatus permstatus,
          char typeflag)
          struct stat const *cur_info,
          mode_t invert_permissions, enum permstatus permstatus,
          char typeflag)


@@ -256,8 +253,11 @@ set_stat (char const *file_name,
          /* FIXME: incremental_option should set ctime too, but how?  */
 
          struct timespec ts[2];
          /* FIXME: incremental_option should set ctime too, but how?  */
 
          struct timespec ts[2];

-         ts[0] = incremental_option ? get_stat_atime (stat_info) : start_time;
-         ts[1] = get_stat_mtime (stat_info);
+         if (incremental_option)
+           ts[0] = st->atime;
+         else
+           ts[0] = start_time;
+         ts[1] = st->mtime;

 
          if (utimens (file_name, ts) != 0)
            utime_error (file_name);
 
          if (utimens (file_name, ts) != 0)
            utime_error (file_name);


@@ -269,11 +269,11 @@ set_stat (char const *file_name,
        }
 
       /* Some systems allow non-root users to give files away.  Once this
        }
 
       /* Some systems allow non-root users to give files away.  Once this

-        done, it is not possible anymore to change file permissions, so we
-        have to set permissions prior to possibly giving files away.  */
-
-      set_mode (file_name, stat_info, cur_info,
-               invert_permissions, permstatus, typeflag);
+        done, it is not possible anymore to change file permissions.
+        However, setting file permissions now would be incorrect, since
+        they would apply to the wrong user, and there would be a race
+        condition.  So, don't use systems that allow non-root users to
+        give files away.  */

     }
 
   if (0 < same_owner_option && permstatus != INTERDIR_PERMSTATUS)
     }
 
   if (0 < same_owner_option && permstatus != INTERDIR_PERMSTATUS)


@@ -282,52 +282,77 @@ set_stat (char const *file_name,
         the symbolic link itself.  In this case, a mere chown would change
         the attributes of the file the symbolic link is pointing to, and
         should be avoided.  */
         the symbolic link itself.  In this case, a mere chown would change
         the attributes of the file the symbolic link is pointing to, and
         should be avoided.  */

+      int chown_result = 1;

 
       if (typeflag == SYMTYPE)
        {
 #if HAVE_LCHOWN
 
       if (typeflag == SYMTYPE)
        {
 #if HAVE_LCHOWN

-         if (lchown (file_name, stat_info->st_uid, stat_info->st_gid) < 0)
-           chown_error_details (file_name,
-                                stat_info->st_uid, stat_info->st_gid);
+         chown_result = lchown (file_name, st->stat.st_uid, st->stat.st_gid);

 #endif
        }
       else
        {
 #endif
        }
       else
        {

-         if (chown (file_name, stat_info->st_uid, stat_info->st_gid) < 0)
-           chown_error_details (file_name,
-                                stat_info->st_uid, stat_info->st_gid);
-
-         /* On a few systems, and in particular, those allowing to give files
-            away, changing the owner or group destroys the suid or sgid bits.
-            So let's attempt setting these bits once more.  */
-         if (stat_info->st_mode & (S_ISUID | S_ISGID | S_ISVTX))
-           set_mode (file_name, stat_info, 0,
-                     invert_permissions, permstatus, typeflag);
+         chown_result = chown (file_name, st->stat.st_uid, st->stat.st_gid);

        }
        }

+
+      if (chown_result == 0)
+       {
+         /* Changing the owner can flip st_mode bits in some cases, so
+            ignore cur_info if it might be obsolete now.  */
+         if (cur_info
+             && cur_info->st_mode & S_IXUGO
+             && cur_info->st_mode & (S_ISUID | S_ISGID))
+           cur_info = NULL;
+       }
+      else if (chown_result < 0)
+       chown_error_details (file_name,
+                            st->stat.st_uid, st->stat.st_gid);

     }
     }

+
+  if (typeflag != SYMTYPE)
+    set_mode (file_name, &st->stat, cur_info,
+             invert_permissions, permstatus, typeflag);

 }
 
 /* Remember to restore stat attributes (owner, group, mode and times)
 }
 
 /* Remember to restore stat attributes (owner, group, mode and times)

-   for the directory FILE_NAME, using information given in *STAT_INFO,
+   for the directory FILE_NAME, using information given in *ST,

    once we stop extracting files into that directory.
    If not restoring permissions, remember to invert the
    INVERT_PERMISSIONS bits from the file's current permissions.
    once we stop extracting files into that directory.
    If not restoring permissions, remember to invert the
    INVERT_PERMISSIONS bits from the file's current permissions.

-   PERMSTATUS specifies the status of the file's permissions.  */
+   PERMSTATUS specifies the status of the file's permissions.
+
+   NOTICE: this works only if the archive has usual member order, i.e.
+   directory, then the files in that directory. Incremental archive have
+   somewhat reversed order: first go subdirectories, then all other
+   members. To help cope with this case the variable
+   delay_directory_restore_option is set by prepare_to_extract.
+
+   If an archive was explicitely created so that its member order is
+   reversed, some directory timestamps can be restored incorrectly,
+   e.g.:
+       tar --no-recursion -cf archive dir dir/file1 foo dir/file2
+*/

 static void
 static void

-delay_set_stat (char const *file_name, struct stat const *stat_info,
+delay_set_stat (char const *file_name, struct tar_stat_info const *st,

                mode_t invert_permissions, enum permstatus permstatus)
 {
   size_t file_name_len = strlen (file_name);
   struct delayed_set_stat *data =
     xmalloc (offsetof (struct delayed_set_stat, file_name)
             + file_name_len + 1);
                mode_t invert_permissions, enum permstatus permstatus)
 {
   size_t file_name_len = strlen (file_name);
   struct delayed_set_stat *data =
     xmalloc (offsetof (struct delayed_set_stat, file_name)
             + file_name_len + 1);

+  data->next = delayed_set_stat_head;
+  data->dev = st->stat.st_dev;
+  data->ino = st->stat.st_ino;
+  data->mode = st->stat.st_mode;
+  data->uid = st->stat.st_uid;
+  data->gid = st->stat.st_gid;
+  data->atime = st->atime;
+  data->mtime = st->mtime;

   data->file_name_len = file_name_len;
   data->file_name_len = file_name_len;

-  strcpy (data->file_name, file_name);

   data->invert_permissions = invert_permissions;
   data->permstatus = permstatus;
   data->after_links = 0;
   data->invert_permissions = invert_permissions;
   data->permstatus = permstatus;
   data->after_links = 0;

-  data->stat_info = *stat_info;
-  data->next = delayed_set_stat_head;
+  strcpy (data->file_name, file_name);

   delayed_set_stat_head = data;
 }
 
   delayed_set_stat_head = data;
 }
 


@@ -352,9 +377,16 @@ repair_delayed_set_stat (char const *dir,
       if (st.st_dev == dir_stat_info->st_dev
          && st.st_ino == dir_stat_info->st_ino)
        {
       if (st.st_dev == dir_stat_info->st_dev
          && st.st_ino == dir_stat_info->st_ino)
        {

-         data->stat_info = current_stat_info.stat;
+         data->dev = current_stat_info.stat.st_dev;
+         data->ino = current_stat_info.stat.st_ino;
+         data->mode = current_stat_info.stat.st_mode;
+         data->uid = current_stat_info.stat.st_uid;
+         data->gid = current_stat_info.stat.st_gid;
+         data->atime = current_stat_info.atime;
+         data->mtime = current_stat_info.mtime;

          data->invert_permissions =
          data->invert_permissions =

-           (MODE_RWX & (current_stat_info.stat.st_mode ^ st.st_mode));
+           ((current_stat_info.stat.st_mode ^ st.st_mode)
+            & MODE_RWX & ~ current_umask);

          data->permstatus = ARCHIVED_PERMSTATUS;
          return;
        }
          data->permstatus = ARCHIVED_PERMSTATUS;
          return;
        }


@@ -372,13 +404,12 @@ static int
 make_directories (char *file_name)
 {
   char *cursor0 = file_name + FILE_SYSTEM_PREFIX_LEN (file_name);
 make_directories (char *file_name)
 {
   char *cursor0 = file_name + FILE_SYSTEM_PREFIX_LEN (file_name);

-  char *cursor;                        /* points into the file name */
+  char *cursor;                        /* points into the file name */

   int did_something = 0;       /* did we do anything yet? */
   int mode;
   int invert_permissions;
   int status;
 
   int did_something = 0;       /* did we do anything yet? */
   int mode;
   int invert_permissions;
   int status;
 

-

   for (cursor = cursor0; *cursor; cursor++)
     {
       if (! ISSLASH (*cursor))
   for (cursor = cursor0; *cursor; cursor++)
     {
       if (! ISSLASH (*cursor))


@@ -408,7 +439,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,
             invert_permissions is zero, because
             repair_delayed_set_stat may need to update the struct.  */
          delay_set_stat (file_name,

-                         &current_stat_info.stat /* ignored */,
+                         &current_stat_info,

                          invert_permissions, INTERDIR_PERMSTATUS);
 
          print_for_mkdir (file_name, cursor - file_name, mode);
                          invert_permissions, INTERDIR_PERMSTATUS);
 
          print_for_mkdir (file_name, cursor - file_name, mode);


@@ -448,7 +479,7 @@ file_newer_p (const char *file_name, struct tar_stat_info *tar_stat)
       return errno != ENOENT;
     }
   if (!S_ISDIR (st.st_mode)
       return errno != ENOENT;
     }
   if (!S_ISDIR (st.st_mode)

-      && st.st_mtime >= tar_stat->stat.st_mtime)
+      && tar_timespec_cmp (tar_stat->mtime, get_stat_mtime (&st)) <= 0)

     {
       return true;
     }
     {
       return true;
     }


@@ -551,8 +582,7 @@ apply_nonancestor_delayed_set_stat (char const *file_name, bool after_links)
              stat_error (data->file_name);
              skip_this_one = 1;
            }
              stat_error (data->file_name);
              skip_this_one = 1;
            }

-         else if (! (st.st_dev == data->stat_info.st_dev
-                     && (st.st_ino == data->stat_info.st_ino)))
+         else if (! (st.st_dev == data->dev && st.st_ino == data->ino))

            {
              ERROR ((0, 0,
                      _("%s: Directory renamed before its status could be extracted"),
            {
              ERROR ((0, 0,
                      _("%s: Directory renamed before its status could be extracted"),


@@ -562,8 +592,16 @@ apply_nonancestor_delayed_set_stat (char const *file_name, bool after_links)
        }
 
       if (! skip_this_one)
        }
 
       if (! skip_this_one)

-       set_stat (data->file_name, &data->stat_info, cur_info,
-                 data->invert_permissions, data->permstatus, DIRTYPE);
+       {
+         struct tar_stat_info sb;
+         sb.stat.st_mode = data->mode;
+         sb.stat.st_uid = data->uid;
+         sb.stat.st_gid = data->gid;
+         sb.atime = data->atime;
+         sb.mtime = data->mtime;
+         set_stat (data->file_name, &sb, cur_info,
+                   data->invert_permissions, data->permstatus, DIRTYPE);
+       }

 
       delayed_set_stat_head = data->next;
       free (data);
 
       delayed_set_stat_head = data->next;
       free (data);


@@ -581,13 +619,28 @@ extract_dir (char *file_name, int typeflag)
   mode_t mode;
   int interdir_made = 0;
 
   mode_t mode;
   int interdir_made = 0;
 

+  /* Save 'root device' to avoid purging mount points. */
+  if (one_file_system_option && root_device == 0)
+    {
+      struct stat st;
+      char *dir = xgetcwd ();
+
+      if (deref_stat (true, dir, &st))
+       stat_diag (dir);
+      else
+       root_device = st.st_dev;
+      free (dir);
+    }
+

   if (incremental_option)
     /* Read the entry and delete files that aren't listed in the archive.  */
     purge_directory (file_name);
   else if (typeflag == GNUTYPE_DUMPDIR)
     skip_member ();
 
   if (incremental_option)
     /* Read the entry and delete files that aren't listed in the archive.  */
     purge_directory (file_name);
   else if (typeflag == GNUTYPE_DUMPDIR)
     skip_member ();
 

-  mode = (current_stat_info.stat.st_mode | (we_are_root ? 0 : MODE_WXUSR)) & MODE_RWX;
+  mode = current_stat_info.stat.st_mode | (we_are_root ? 0 : MODE_WXUSR);
+  if (0 < same_owner_option || current_stat_info.stat.st_mode & ~ MODE_RWX)
+    mode &= S_IRWXU;

 
   while ((status = mkdir (file_name, mode)))
     {
 
   while ((status = mkdir (file_name, mode)))
     {


@@ -606,7 +659,7 @@ extract_dir (char *file_name, int typeflag)
                }
              if (S_ISDIR (st.st_mode))
                {
                }
              if (S_ISDIR (st.st_mode))
                {

-                 mode = st.st_mode & ~ current_umask;
+                 mode = st.st_mode;

                  break;
                }
            }
                  break;
                }
            }


@@ -627,25 +680,29 @@ extract_dir (char *file_name, int typeflag)
   if (status == 0
       || old_files_option == DEFAULT_OLD_FILES
       || old_files_option == OVERWRITE_OLD_FILES)
   if (status == 0
       || old_files_option == DEFAULT_OLD_FILES
       || old_files_option == OVERWRITE_OLD_FILES)

-    delay_set_stat (file_name, &current_stat_info.stat,
-                   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 ^ current_stat_info.stat.st_mode)
+                        & MODE_RWX & ~ current_umask),
+                       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;
 }
 
 
 static int
   return status;
 }
 
 
 static int

-open_output_file (char *file_name, int typeflag)
+open_output_file (char *file_name, int typeflag, mode_t mode)

 {
   int fd;
   int openflag = (O_WRONLY | O_BINARY | O_CREAT
                  | (old_files_option == OVERWRITE_OLD_FILES
                     ? O_TRUNC
                     : O_EXCL));
 {
   int fd;
   int openflag = (O_WRONLY | O_BINARY | O_CREAT
                  | (old_files_option == OVERWRITE_OLD_FILES
                     ? O_TRUNC
                     : O_EXCL));

-  mode_t mode = current_stat_info.stat.st_mode & MODE_RWX & ~ current_umask;

 
 #if O_CTG
   /* Contiguous files (on the Masscomp) have to specify the size in
 
 #if O_CTG
   /* Contiguous files (on the Masscomp) have to specify the size in


@@ -684,6 +741,9 @@ extract_file (char *file_name, int typeflag)
   size_t count;
   size_t written;
   int interdir_made = 0;
   size_t count;
   size_t written;
   int interdir_made = 0;

+  mode_t mode = current_stat_info.stat.st_mode & MODE_RWX & ~ current_umask;
+  mode_t invert_permissions =
+    0 < same_owner_option ? mode & (S_IRWXG | S_IRWXO) : 0;

 
   /* FIXME: deal with protection issues.  */
 
 
   /* FIXME: deal with protection issues.  */
 


@@ -701,27 +761,24 @@ extract_file (char *file_name, int typeflag)
   else
     {
       do
   else
     {
       do

-       fd = open_output_file (file_name, typeflag);
+       fd = open_output_file (file_name, typeflag, mode ^ invert_permissions);

       while (fd < 0 && maybe_recoverable (file_name, &interdir_made));
 
       if (fd < 0)
        {
       while (fd < 0 && maybe_recoverable (file_name, &interdir_made));
 
       if (fd < 0)
        {

+         skip_member ();

          open_error (file_name);
          return 1;
        }
     }
 
          open_error (file_name);
          return 1;
        }
     }
 

+  mv_begin (&current_stat_info);

   if (current_stat_info.is_sparse)
     sparse_extract_file (fd, &current_stat_info, &size);
   else
     for (size = current_stat_info.stat.st_size; size > 0; )
       {
   if (current_stat_info.is_sparse)
     sparse_extract_file (fd, &current_stat_info, &size);
   else
     for (size = current_stat_info.stat.st_size; size > 0; )
       {

-       if (multi_volume_option)
-         {
-           assign_string (&save_name, current_stat_info.orig_file_name);
-           save_totsize = current_stat_info.stat.st_size;
-           save_sizeleft = size;
-         }
+       mv_size_left (size);

 
        /* Locate data, determine max length writeable, write it,
           block that we have used the data, then check if the write
 
        /* Locate data, determine max length writeable, write it,
           block that we have used the data, then check if the write


@@ -755,8 +812,7 @@ extract_file (char *file_name, int typeflag)
 
   skip_file (size);
 
 
   skip_file (size);
 

-  if (multi_volume_option)
-    assign_string (&save_name, 0);
+  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.  */
 
   /* 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.  */


@@ -771,7 +827,7 @@ extract_file (char *file_name, int typeflag)
   if (to_command_option)
     sys_wait_command ();
   else
   if (to_command_option)
     sys_wait_command ();
   else

-    set_stat (file_name, &current_stat_info.stat, 0, 0,
+    set_stat (file_name, &current_stat_info, NULL, invert_permissions,

              (old_files_option == OVERWRITE_OLD_FILES ?
               UNKNOWN_PERMSTATUS : ARCHIVED_PERMSTATUS),
              typeflag);
              (old_files_option == OVERWRITE_OLD_FILES ?
               UNKNOWN_PERMSTATUS : ARCHIVED_PERMSTATUS),
              typeflag);


@@ -815,7 +871,7 @@ create_placeholder_file (char *file_name, bool is_symlink, int *interdir_made)
       delayed_link_head = p;
       p->dev = st.st_dev;
       p->ino = st.st_ino;
       delayed_link_head = p;
       p->dev = st.st_dev;
       p->ino = st.st_ino;

-      p->mtime = st.st_mtime;
+      p->mtime = get_stat_mtime (&st);

       p->is_symlink = is_symlink;
       if (is_symlink)
        {
       p->is_symlink = is_symlink;
       if (is_symlink)
        {


@@ -832,7 +888,7 @@ create_placeholder_file (char *file_name, bool is_symlink, int *interdir_made)
       if (h && ! h->after_links
          && strncmp (file_name, h->file_name, h->file_name_len) == 0
          && ISSLASH (file_name[h->file_name_len])
       if (h && ! h->after_links
          && strncmp (file_name, h->file_name, h->file_name_len) == 0
          && ISSLASH (file_name[h->file_name_len])

-         && (base_name (file_name) == file_name + h->file_name_len + 1))
+         && (last_component (file_name) == file_name + h->file_name_len + 1))

        {
          do
            {
        {
          do
            {


@@ -842,8 +898,8 @@ create_placeholder_file (char *file_name, bool is_symlink, int *interdir_made)
                stat_error (h->file_name);
              else
                {
                stat_error (h->file_name);
              else
                {

-                 h->stat_info.st_dev = st.st_dev;
-                 h->stat_info.st_ino = st.st_ino;
+                 h->dev = st.st_dev;
+                 h->ino = st.st_ino;

                }
            }
          while ((h = h->next) && ! h->after_links);
                }
            }
          while ((h = h->next) && ! h->after_links);


@@ -858,10 +914,12 @@ create_placeholder_file (char *file_name, bool is_symlink, int *interdir_made)
 static int
 extract_link (char *file_name, int typeflag)
 {
 static int
 extract_link (char *file_name, int typeflag)
 {

-  char const *link_name = safer_name_suffix (current_stat_info.link_name,
-                                             true, absolute_names_option);

   int interdir_made = 0;
   int interdir_made = 0;

+  char const *link_name;

 
 

+  transform_member_name (&current_stat_info.link_name, xform_link);
+  link_name = current_stat_info.link_name;
+  

   if (! absolute_names_option && contains_dot_dot (link_name))
     return create_placeholder_file (file_name, false, &interdir_made);
 
   if (! absolute_names_option && contains_dot_dot (link_name))
     return create_placeholder_file (file_name, false, &interdir_made);
 


@@ -879,7 +937,7 @@ extract_link (char *file_name, int typeflag)
            for (; ds; ds = ds->next)
              if (ds->dev == st1.st_dev
                  && ds->ino == st1.st_ino
            for (; ds; ds = ds->next)
              if (ds->dev == st1.st_dev
                  && ds->ino == st1.st_ino

-                 && ds->mtime == st1.st_mtime)
+                 && timespec_cmp (ds->mtime, get_stat_mtime (&st1)) == 0)

                {
                  struct string_list *p =  xmalloc (offsetof (struct string_list, string)
                                                    + strlen (file_name) + 1);
                {
                  struct string_list *p =  xmalloc (offsetof (struct string_list, string)
                                                    + strlen (file_name) + 1);


@@ -916,6 +974,8 @@ extract_symlink (char *file_name, int typeflag)
   int status;
   int interdir_made = 0;
 
   int status;
   int interdir_made = 0;
 

+  transform_member_name (&current_stat_info.link_name, xform_symlink);
+

   if (! absolute_names_option
       && (IS_ABSOLUTE_FILE_NAME (current_stat_info.link_name)
          || contains_dot_dot (current_stat_info.link_name)))
   if (! absolute_names_option
       && (IS_ABSOLUTE_FILE_NAME (current_stat_info.link_name)
          || contains_dot_dot (current_stat_info.link_name)))


@@ -926,7 +986,7 @@ extract_symlink (char *file_name, int typeflag)
       break;
 
   if (status == 0)
       break;
 
   if (status == 0)

-    set_stat (file_name, &current_stat_info.stat, 0, 0, 0, SYMTYPE);
+    set_stat (file_name, &current_stat_info, NULL, 0, 0, SYMTYPE);

   else
     symlink_error (current_stat_info.link_name, file_name);
   return status;
   else
     symlink_error (current_stat_info.link_name, file_name);
   return status;


@@ -949,16 +1009,20 @@ extract_node (char *file_name, int typeflag)
 {
   int status;
   int interdir_made = 0;
 {
   int status;
   int interdir_made = 0;

+  mode_t mode = current_stat_info.stat.st_mode & ~ current_umask;
+  mode_t invert_permissions =
+    0 < same_owner_option ? mode & (S_IRWXG | S_IRWXO) : 0;

 
   do
 
   do

-    status = mknod (file_name, current_stat_info.stat.st_mode,
+    status = mknod (file_name, mode ^ invert_permissions,

                    current_stat_info.stat.st_rdev);
   while (status && maybe_recoverable (file_name, &interdir_made));
 
   if (status != 0)
     mknod_error (file_name);
   else
                    current_stat_info.stat.st_rdev);
   while (status && maybe_recoverable (file_name, &interdir_made));
 
   if (status != 0)
     mknod_error (file_name);
   else

-    set_stat (file_name, &current_stat_info.stat, 0, 0, ARCHIVED_PERMSTATUS, typeflag);
+    set_stat (file_name, &current_stat_info, NULL, invert_permissions,
+             ARCHIVED_PERMSTATUS, typeflag);

   return status;
 }
 #endif
   return status;
 }
 #endif


@@ -969,13 +1033,16 @@ extract_fifo (char *file_name, int typeflag)
 {
   int status;
   int interdir_made = 0;
 {
   int status;
   int interdir_made = 0;

+  mode_t mode = current_stat_info.stat.st_mode & ~ current_umask;
+  mode_t invert_permissions =
+    0 < same_owner_option ? mode & (S_IRWXG | S_IRWXO) : 0;

 
 

-  while ((status = mkfifo (file_name, current_stat_info.stat.st_mode)))
+  while ((status = mkfifo (file_name, mode)) != 0)

     if (!maybe_recoverable (file_name, &interdir_made))
       break;
 
   if (status == 0)
     if (!maybe_recoverable (file_name, &interdir_made))
       break;
 
   if (status == 0)

-    set_stat (file_name, &current_stat_info.stat, NULL, 0,
+    set_stat (file_name, &current_stat_info, NULL, invert_permissions,

              ARCHIVED_PERMSTATUS, typeflag);
   else
     mkfifo_error (file_name);
              ARCHIVED_PERMSTATUS, typeflag);
   else
     mkfifo_error (file_name);


@@ -984,13 +1051,14 @@ extract_fifo (char *file_name, int typeflag)
 #endif
 
 static int
 #endif
 
 static int

-extract_mangle_wrapper (char *file_name, int typeflag)
+extract_volhdr (char *file_name, int typeflag)

 {
 {

-  extract_mangle ();
+  if (verbose_option)
+    fprintf (stdlis, _("Reading %s\n"), quote (current_stat_info.file_name));
+  skip_member ();

   return 0;
 }
 
   return 0;
 }
 

-

 static int
 extract_failure (char *file_name, int typeflag)
 {
 static int
 extract_failure (char *file_name, int typeflag)
 {


@@ -1065,16 +1133,12 @@ prepare_to_extract (char const *file_name, int typeflag, tar_extractor_t *fun)
     case DIRTYPE:
     case GNUTYPE_DUMPDIR:
       *fun = extract_dir;
     case DIRTYPE:
     case GNUTYPE_DUMPDIR:
       *fun = extract_dir;

+      if (current_stat_info.is_dumpdir)
+       delay_directory_restore_option = true;

       break;
 
     case GNUTYPE_VOLHDR:
       break;
 
     case GNUTYPE_VOLHDR:

-      if (verbose_option)
-       fprintf (stdlis, _("Reading %s\n"), quote (current_stat_info.file_name));
-      *fun = NULL;
-      break;
-
-    case GNUTYPE_NAMES:
-      *fun = extract_mangle_wrapper;
+      *fun = extract_volhdr;

       break;
 
     case GNUTYPE_MULTIVOL:
       break;
 
     case GNUTYPE_MULTIVOL:


@@ -1135,59 +1199,49 @@ void
 extract_archive (void)
 {
   char typeflag;
 extract_archive (void)
 {
   char typeflag;

-  char *file_name;

   tar_extractor_t fun;
 
   set_next_block_after (current_header);
   decode_header (current_header, &current_stat_info, &current_format, 1);
   tar_extractor_t fun;
 
   set_next_block_after (current_header);
   decode_header (current_header, &current_stat_info, &current_format, 1);

-
-  if (interactive_option && !confirm ("extract", current_stat_info.file_name))
+  if (!current_stat_info.file_name[0]
+      || (interactive_option
+         && !confirm ("extract", current_stat_info.file_name)))

     {
       skip_member ();
       return;
     }
 
   /* Print the block from current_header and current_stat.  */
     {
       skip_member ();
       return;
     }
 
   /* Print the block from current_header and current_stat.  */

-

   if (verbose_option)
     print_header (&current_stat_info, -1);
 
   if (verbose_option)
     print_header (&current_stat_info, -1);
 

-  file_name = safer_name_suffix (current_stat_info.file_name,
-                                 false, absolute_names_option);
-  if (strip_name_components)
-    {
-      size_t prefix_len = stripped_prefix_len (file_name, strip_name_components);
-      if (prefix_len == (size_t) -1)
-       {
-         skip_member ();
-         return;
-       }
-      file_name += prefix_len;
-    }
-
-  apply_nonancestor_delayed_set_stat (file_name, 0);
+  /* Restore stats for all non-ancestor directories, unless
+     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);

 
   /* Take a safety backup of a previously existing file.  */
 
   if (backup_option)
 
   /* Take a safety backup of a previously existing file.  */
 
   if (backup_option)

-    if (!maybe_backup_file (file_name, 0))
+    if (!maybe_backup_file (current_stat_info.file_name, 0))

       {
        int e = errno;
        ERROR ((0, e, _("%s: Was unable to backup this file"),
       {
        int e = errno;
        ERROR ((0, e, _("%s: Was unable to backup this file"),

-               quotearg_colon (file_name)));
+               quotearg_colon (current_stat_info.file_name)));

        skip_member ();
        return;
       }
 
   /* Extract the archive entry according to its type.  */
        skip_member ();
        return;
       }
 
   /* Extract the archive entry according to its type.  */

-

   /* KLUDGE */
   typeflag = sparse_member_p (&current_stat_info) ?
                   GNUTYPE_SPARSE : current_header->header.typeflag;
 
   /* KLUDGE */
   typeflag = sparse_member_p (&current_stat_info) ?
                   GNUTYPE_SPARSE : current_header->header.typeflag;
 

-  if (prepare_to_extract (file_name, typeflag, &fun))
+  if (prepare_to_extract (current_stat_info.file_name, typeflag, &fun))

     {
     {

-      if (fun && (*fun) (file_name, typeflag) && backup_option)
+      if (fun && (*fun) (current_stat_info.file_name, typeflag)
+         && backup_option)

        undo_last_backup ();
     }
   else
        undo_last_backup ();
     }
   else


@@ -1217,7 +1271,7 @@ apply_delayed_links (void)
          if (lstat (source, &st) == 0
              && st.st_dev == ds->dev
              && st.st_ino == ds->ino
          if (lstat (source, &st) == 0
              && st.st_dev == ds->dev
              && st.st_ino == ds->ino

-             && st.st_mtime == ds->mtime)
+             && timespec_cmp (get_stat_mtime (&st), ds->mtime) == 0)

            {
              /* Unlink the placeholder, then create a hard link if possible,
                 a symbolic link otherwise.  */
            {
              /* Unlink the placeholder, then create a hard link if possible,
                 a symbolic link otherwise.  */


@@ -1234,10 +1288,11 @@ apply_delayed_links (void)
                symlink_error (ds->target, source);
              else
                {
                symlink_error (ds->target, source);
              else
                {

+                 struct tar_stat_info st1;
+                 st1.stat.st_uid = ds->uid;
+                 st1.stat.st_gid = ds->gid;
+                 set_stat (source, &st1, NULL, 0, 0, SYMTYPE);

                  valid_source = source;
                  valid_source = source;

-                 st.st_uid = ds->uid;
-                 st.st_gid = ds->gid;
-                 set_stat (source, &st, 0, 0, 0, SYMTYPE);

                }
            }
        }
                }
            }
        }


@@ -1275,6 +1330,39 @@ extract_finish (void)
   apply_nonancestor_delayed_set_stat ("", 1);
 }
 
   apply_nonancestor_delayed_set_stat ("", 1);
 }
 

+bool
+rename_directory (char *src, char *dst)
+{
+  if (rename (src, dst))
+    {
+      int e = errno;
+
+      switch (e)
+       {
+       case ENOENT:
+         if (make_directories (dst))
+           {
+             if (rename (src, dst) == 0)
+               return true;
+             e = errno;
+           }
+         break;
+
+       case EXDEV:
+         /* FIXME: Fall back to recursive copying */
+
+       default:
+         break;
+       }
+
+      ERROR ((0, e, _("Cannot rename %s to %s"),
+             quote_n (0, src),
+             quote_n (1, dst)));
+      return false;
+    }
+  return true;
+}
+

 void
 fatal_exit (void)
 {
 void
 fatal_exit (void)
 {