tar: switch to gnulib fdutimensat module

[chaz/tar] / src / extract.c

diff --git a/src/extract.c b/src/extract.c
index 9d47c58bcd8b1fdc04799bcc1cf7e1c54fcc3f91..29967e4c78869e12965e08e94462cabfdebd2128 100644 (file)
--- a/src/extract.c
+++ b/src/extract.c
@@ -1,10 +1,13 @@
 /* Extract files from a tar archive.
 /* Extract files from a tar archive.

-   Copyright 1988, 92,93,94,96,97,98, 1999 Free Software Foundation, Inc.
+
+   Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1998, 1999, 2000,
+   2001, 2003, 2004, 2005, 2006, 2007, 2010 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


@@ -14,39 +17,135 @@
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation, Inc.,
 
    You should have received a copy of the GNU General Public License along
    with this program; if not, write to the Free Software Foundation, Inc.,

-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */

 
 

-#include "system.h"
-
-#if HAVE_UTIME_H
-# include <utime.h>
-#else
-struct utimbuf
-  {
-    long actime;
-    long modtime;
-  };
-#endif
+#include <system.h>
+#include <quotearg.h>
+#include <errno.h>
+#include <priv-set.h>

 
 #include "common.h"
 
 
 #include "common.h"
 

-static int we_are_root;                /* true if our effective uid == 0 */
+static bool we_are_root;       /* true if our effective uid == 0 */

 static mode_t newdir_umask;    /* umask when creating new directories */
 static mode_t current_umask;   /* current umask (which is set to 0 if -p) */
 
 static mode_t newdir_umask;    /* umask when creating new directories */
 static mode_t current_umask;   /* current umask (which is set to 0 if -p) */
 

+#define ALL_MODE_BITS ((mode_t) ~ (mode_t) 0)
+
+#if ! HAVE_FCHMOD && ! defined fchmod
+# define fchmod(fd, mode) (errno = ENOSYS, -1)
+#endif
+#if ! HAVE_FCHOWN && ! defined fchown
+# define fchown(fd, uid, gid) (errno = ENOSYS, -1)
+#endif
+
+/* Return true if an error number ERR means the system call is
+   supported in this case.  */
+static bool
+implemented (int err)
+{
+  return ! (err == ENOSYS
+           || err == ENOTSUP
+           || (EOPNOTSUPP != ENOTSUP && err == EOPNOTSUPP));
+}
+
+/* List of directories whose statuses we need to extract after we've
+   finished extracting their subsidiary files.  If you consider each
+   contiguous subsequence of elements of the form [D]?[^D]*, where [D]
+   represents an element where AFTER_LINKS is nonzero and [^D]
+   represents an element where AFTER_LINKS is zero, then the head
+   of the subsequence has the longest name, and each non-head element
+   in the prefix is an ancestor (in the directory hierarchy) of the
+   preceding element.  */
+

 struct delayed_set_stat
   {
 struct delayed_set_stat
   {

+    /* Next directory in list.  */

     struct delayed_set_stat *next;
     struct delayed_set_stat *next;

-    char *file_name;
-    struct stat stat_info;
+
+    /* Metadata for this directory.  */
+    dev_t dev;
+    ino_t ino;
+    mode_t mode; /* The desired mode is MODE & ~ current_umask.  */
+    uid_t uid;
+    gid_t gid;
+    struct timespec atime;
+    struct timespec mtime;
+
+    /* An estimate of the directory's current mode, along with a mask
+       specifying which bits of this estimate are known to be correct.
+       If CURRENT_MODE_MASK is zero, CURRENT_MODE's value doesn't
+       matter.  */
+    mode_t current_mode;
+    mode_t current_mode_mask;
+
+    /* This directory is an intermediate directory that was created
+       as an ancestor of some other directory; it was not mentioned
+       in the archive, so do not set its uid, gid, atime, or mtime,
+       and don't alter its mode outside of MODE_RWX.  */
+    bool interdir;
+
+    /* Whether symbolic links should be followed when accessing the
+       directory.  */
+    int atflag;
+
+    /* Do not set the status of this directory until after delayed
+       links are created.  */
+    bool after_links;
+
+    /* Directory that the name is relative to.  */
+    int change_dir;
+
+    /* Length and contents of name.  */
+    size_t file_name_len;
+    char file_name[1];

   };
 
 static struct delayed_set_stat *delayed_set_stat_head;
 
   };
 
 static struct delayed_set_stat *delayed_set_stat_head;
 

-/*--------------------------.
-| Set up to extract files.  |
-`--------------------------*/
+/* List of links whose creation we have delayed.  */
+struct delayed_link
+  {
+    /* The next delayed link in the list.  */
+    struct delayed_link *next;
+
+    /* 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 ctime;
+
+    /* True if the link is symbolic.  */
+    bool is_symlink;
+
+    /* The desired metadata, valid only the link is symbolic.  */
+    mode_t mode;
+    uid_t uid;
+    gid_t gid;
+    struct timespec atime;
+    struct timespec mtime;
+
+    /* 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;
+
+    /* The desired target of the desired link.  */
+    char target[1];
+  };
+
+static struct delayed_link *delayed_link_head;
+
+struct string_list
+  {
+    struct string_list *next;
+    char string[1];
+  };

 
 

+/*  Set up to extract files.  */

 void
 extr_init (void)
 {
 void
 extr_init (void)
 {


@@ -66,162 +165,364 @@ extr_init (void)
       umask (newdir_umask);    /* restore the kernel umask */
       current_umask = newdir_umask;
     }
       umask (newdir_umask);    /* restore the kernel umask */
       current_umask = newdir_umask;
     }

+}
+
+/* Use fchmod if possible, fchmodat otherwise.  */
+static int
+fd_chmod (int fd, char const *file, mode_t mode, int atflag)
+{
+  if (0 <= fd)
+    {
+      int result = fchmod (fd, mode);
+      if (result == 0 || implemented (errno))
+       return result;
+    }
+  return fchmodat (AT_FDCWD, file, mode, atflag);
+}

 
 

-  /* FIXME: Just make sure we can add files in directories we create.  Maybe
-     should we later remove permissions we are adding, here?  */
-  newdir_umask &= ~ MODE_WXUSR;
+/* Use fchown if possible, fchownat otherwise.  */
+static int
+fd_chown (int fd, char const *file, uid_t uid, gid_t gid, int atflag)
+{
+  if (0 <= fd)
+    {
+      int result = fchown (fd, uid, gid);
+      if (result == 0 || implemented (errno))
+       return result;
+    }
+  return fchownat (AT_FDCWD, file, uid, gid, atflag);

 }
 
 }
 

-/*------------------------------------------------------------------.
-| Restore mode for FILE_NAME, from information given in STAT_INFO.  |
-`------------------------------------------------------------------*/
+/* Use fstat if possible, fstatat otherwise.  */
+static int
+fd_stat (int fd, char const *file, struct stat *st, int atflag)
+{
+  return (0 <= fd
+         ? fstat (fd, st)
+         : fstatat (AT_FDCWD, file, st, atflag));
+}

 
 

+/* Set the mode for FILE_NAME to MODE.
+   MODE_MASK specifies the bits of MODE that we care about;
+   thus if MODE_MASK is zero, do nothing.
+   If FD is nonnegative, it is a file descriptor for the file.
+   CURRENT_MODE and CURRENT_MODE_MASK specify information known about
+   the file's current mode, using the style of struct delayed_set_stat.
+   TYPEFLAG specifies the type of the file.
+   ATFLAG specifies the flag to use when statting the file.  */

 static void
 static void

-set_mode (char *file_name, struct stat *stat_info)
+set_mode (char const *file_name,
+         mode_t mode, mode_t mode_mask, int fd,
+         mode_t current_mode, mode_t current_mode_mask,
+         char typeflag, int atflag)

 {
 {

-  /* Do nothing unless we are restoring the original permissions.
-
-     We must force permission when -k and -U are not selected, because if the
-     file already existed, open or creat would save the permission bits from
-     the previously created file, ignoring the ones we specified.
-
-     But with -k or -U selected, we know *we* created this file, so the mode
-     bits were set by our open.  If the file has abnormal mode bits, we must
-     chmod since writing or chown has probably reset them.  If the file is
-     normal, we merely skip the chmod.  This works because we did umask (0)
-     when -p, so umask will have left the specified mode alone.  */
-
-  if (0 < same_permissions_option
-      && ((!keep_old_files_option && !unlink_first_option)
-         || (stat_info->st_mode & (S_ISUID | S_ISGID | S_ISVTX))))
-    if (chmod (file_name, ~current_umask & stat_info->st_mode) < 0)
-      ERROR ((0, errno, _("%s: Cannot change mode to %04lo"),
-             file_name,
-             (unsigned long) (~current_umask & stat_info->st_mode)));
+  if (((current_mode ^ mode) | ~ current_mode_mask) & mode_mask)
+    {
+      if (MODE_ALL & ~ mode_mask & ~ current_mode_mask)
+       {
+         struct stat st;
+         if (fd_stat (fd, file_name, &st, atflag) != 0)
+           {
+             stat_error (file_name);
+             return;
+           }
+         current_mode = st.st_mode;
+       }
+
+      current_mode &= MODE_ALL;
+      mode = (current_mode & ~ mode_mask) | (mode & mode_mask);
+
+      if (current_mode != mode)
+       {
+         int chmod_errno =
+           fd_chmod (fd, file_name, mode, atflag) == 0 ? 0 : errno;
+
+         /* On Solaris, chmod may fail if we don't have PRIV_ALL, because
+            setuid-root files would otherwise be a backdoor.  See
+            http://opensolaris.org/jive/thread.jspa?threadID=95826
+            (2009-09-03).  */
+         if (chmod_errno == EPERM && (mode & S_ISUID)
+             && priv_set_restore_linkdir () == 0)
+           {
+             chmod_errno =
+               fd_chmod (fd, file_name, mode, atflag) == 0 ? 0 : errno;
+             priv_set_remove_linkdir ();
+           }
+
+         /* Linux fchmodat does not support AT_SYMLINK_NOFOLLOW, and
+            returns ENOTSUP even when operating on non-symlinks, try
+            again with the flag disabled if it does not appear to be
+            supported and if the file is not a symlink.  This
+            introduces a race, alas.  */
+         if (atflag && typeflag != SYMTYPE && ! implemented (chmod_errno))
+           chmod_errno = fd_chmod (fd, file_name, mode, 0) == 0 ? 0 : errno;
+
+         if (chmod_errno
+             && (typeflag != SYMTYPE || implemented (chmod_errno)))
+           {
+             errno = chmod_errno;
+             chmod_error_details (file_name, mode);
+           }
+       }
+    }

 }
 
 }
 

-/*----------------------------------------------------------------------.
-| Restore stat attributes (owner, group, mode and times) for FILE_NAME, |
-| using information given in STAT_INFO.  SYMLINK_FLAG is non-zero for a |
-| freshly restored symbolic link.                                      |
-`----------------------------------------------------------------------*/
+/* Check time after successfully setting FILE_NAME's time stamp to T.  */
+static void
+check_time (char const *file_name, struct timespec t)
+{
+  if (t.tv_sec <= 0)
+    WARNOPT (WARN_TIMESTAMP,
+            (0, 0, _("%s: implausibly old time stamp %s"),
+             file_name, tartime (t, true)));
+  else if (timespec_cmp (volume_start_time, t) < 0)
+    {
+      struct timespec now;
+      gettime (&now);
+      if (timespec_cmp (now, t) < 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)
+           {
+             diff.tv_nsec += BILLION;
+             diff.tv_sec--;
+           }
+         WARNOPT (WARN_TIMESTAMP,
+                  (0, 0, _("%s: time stamp %s is %s s in the future"),
+                   file_name, tartime (t, true), code_timespec (diff, buf)));
+       }
+    }
+}

 
 

-/* FIXME: About proper restoration of symbolic link attributes, we still do
-   not have it right.  Pretesters' reports tell us we need further study and
-   probably more configuration.  For now, just use lchown if it exists, and
-   punt for the rest.  Sigh!  */
+/* Restore stat attributes (owner, group, mode and times) for
+   FILE_NAME, using information given in *ST.
+   If FD is nonnegative, it is a file descriptor for the file.
+   CURRENT_MODE and CURRENT_MODE_MASK specify information known about
+   the file's current mode, using the style of struct delayed_set_stat.
+   TYPEFLAG specifies the type of the file.
+   If INTERDIR, this is an intermediate directory.
+   ATFLAG specifies the flag to use when statting the file.  */

 
 static void
 
 static void

-set_stat (char *file_name, struct stat *stat_info, int symlink_flag)
+set_stat (char const *file_name,
+         struct tar_stat_info const *st,
+         int fd, mode_t current_mode, mode_t current_mode_mask,
+         char typeflag, bool interdir, int atflag)

 {
 {

-  struct utimbuf utimbuf;
+  /* Do the utime before the chmod because some versions of utime are
+     broken and trash the modes of the file.  */

 
 

-  if (!symlink_flag)
+  if (! touch_option && ! interdir)

     {
     {

-      /* We do the utime before the chmod because some versions of utime are
-        broken and trash the modes of the file.  */
+      struct timespec ts[2];
+      if (incremental_option)
+       ts[0] = st->atime;
+      else
+       ts[0].tv_nsec = UTIME_OMIT;
+      ts[1] = st->mtime;

 
 

-      if (!touch_option)
+      if (fdutimensat (fd, AT_FDCWD, file_name, ts, atflag) == 0)

        {
        {

-         /* We set the accessed time to `now', which is really the time we
-            started extracting files, unless incremental_option is used, in
-            which case .st_atime is used.  */
+         if (incremental_option)
+           check_time (file_name, ts[0]);
+         check_time (file_name, ts[1]);
+       }
+      else if (typeflag != SYMTYPE || implemented (errno))
+       utime_error (file_name);
+    }
+
+  if (0 < same_owner_option && ! interdir)
+    {
+      /* Some systems allow non-root users to give files away.  Once this
+        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.  */
+      uid_t uid = st->stat.st_uid;
+      gid_t gid = st->stat.st_gid;
+
+      if (fd_chown (fd, file_name, uid, gid, atflag) == 0)
+       {
+         /* Changing the owner can clear st_mode bits in some cases.  */
+         if ((current_mode | ~ current_mode_mask) & S_IXUGO)
+           current_mode_mask &= ~ (current_mode & (S_ISUID | S_ISGID));
+       }
+      else if (typeflag != SYMTYPE || implemented (errno))
+       chown_error_details (file_name, uid, gid);
+    }

 
 

-         /* FIXME: incremental_option should set ctime too, but how?  */
+  set_mode (file_name,
+           st->stat.st_mode & ~ current_umask,
+           0 < same_permissions_option && ! interdir ? MODE_ALL : MODE_RWX,
+           fd, current_mode, current_mode_mask, typeflag, atflag);
+}

 
 

-         if (incremental_option)
-           utimbuf.actime = stat_info->st_atime;
-         else
-           utimbuf.actime = start_time;
+/* For each entry H in the leading prefix of entries in HEAD that do
+   not have after_links marked, mark H and fill in its dev and ino
+   members.  Assume HEAD && ! HEAD->after_links.  */
+static void
+mark_after_links (struct delayed_set_stat *head)
+{
+  struct delayed_set_stat *h = head;

 
 

-         utimbuf.modtime = stat_info->st_mtime;
+  do
+    {
+      struct stat st;
+      h->after_links = 1;

 
 

-         if (utime (file_name, &utimbuf) < 0)
-           ERROR ((0, errno,
-                   _("%s: Could not change access and modification times"),
-                   file_name));
+      if (stat (h->file_name, &st) != 0)
+       stat_error (h->file_name);
+      else
+       {
+         h->dev = st.st_dev;
+         h->ino = st.st_ino;

        }
        }

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

 
 

-      /* 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.  */
+/* Remember to restore stat attributes (owner, group, mode and times)
+   for the directory FILE_NAME, using information given in *ST,
+   once we stop extracting files into that directory.

 
 

-      set_mode (file_name, stat_info);
-    }
+   If ST is null, merely create a placeholder node for an intermediate
+   directory that was created by make_directories.

 
 

-  /* If we are root, set the owner and group of the extracted file, so we
-     extract as the original owner.  Or else, if we are running as a user,
-     leave the owner and group as they are, so we extract as that user.  */
+   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 (0 < same_owner_option)
+   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
+delay_set_stat (char const *file_name, struct tar_stat_info const *st,
+               mode_t current_mode, mode_t current_mode_mask,
+               mode_t mode, int atflag)
+{
+  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->mode = mode;
+  if (st)

     {
     {

-      /* When lchown exists, it should be used to change the attributes of
-        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.  */
+      data->dev = st->stat.st_dev;
+      data->ino = st->stat.st_ino;
+      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->current_mode = current_mode;
+  data->current_mode_mask = current_mode_mask;
+  data->interdir = ! st;
+  data->atflag = atflag;
+  data->after_links = 0;
+  data->change_dir = chdir_current;
+  strcpy (data->file_name, file_name);
+  delayed_set_stat_head = data;
+  if (must_be_dot_or_slash (file_name))
+    mark_after_links (data);
+}

 
 

-      if (symlink_flag)
+/* Update the delayed_set_stat info for an intermediate directory
+   created within the file name of DIR.  The intermediate directory turned
+   out to be the same as this directory, e.g. due to ".." or symbolic
+   links.  *DIR_STAT_INFO is the status of the directory.  */
+static void
+repair_delayed_set_stat (char const *dir,
+                        struct stat const *dir_stat_info)
+{
+  struct delayed_set_stat *data;
+  for (data = delayed_set_stat_head;  data;  data = data->next)
+    {
+      struct stat st;
+      if (fstatat (AT_FDCWD, data->file_name, &st, data->atflag) != 0)

        {
        {

-#if HAVE_LCHOWN
-         if (lchown (file_name, stat_info->st_uid, stat_info->st_gid) < 0)
-           ERROR ((0, errno, _("%s: Cannot lchown to uid %lu gid %lu"),
-                   file_name,
-                   (unsigned long) stat_info->st_uid,
-                   (unsigned long) stat_info->st_gid));
-#endif
+         stat_error (data->file_name);
+         return;

        }
        }

-      else
+
+      if (st.st_dev == dir_stat_info->st_dev
+         && st.st_ino == dir_stat_info->st_ino)

        {
        {

-         if (chown (file_name, stat_info->st_uid, stat_info->st_gid) < 0)
-           ERROR ((0, errno, _("%s: Cannot chown to uid %lu gid %lu"),
-                   file_name,
-                   (unsigned long) stat_info->st_uid,
-                   (unsigned long) 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);
+         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->current_mode = st.st_mode;
+         data->current_mode_mask = ALL_MODE_BITS;
+         data->interdir = false;
+         return;

        }
     }
        }
     }

-}

 
 

-/*-----------------------------------------------------------------------.
-| After a file/link/symlink/directory creation has failed, see if it's  |
-| because some required directory was not present, and if so, create all |
-| required directories.  Return non-zero if a directory was created.    |
-`-----------------------------------------------------------------------*/
+  ERROR ((0, 0, _("%s: Unexpected inconsistency when making directory"),
+         quotearg_colon (dir)));
+}

 
 

+/* After a file/link/directory creation has failed, see if
+   it's because some required directory was not present, and if so,
+   create all required directories.  Return non-zero if a directory
+   was created.  */

 static int
 make_directories (char *file_name)
 {
 static int
 make_directories (char *file_name)
 {

-  char *cursor;                        /* points into path */
+  char *cursor0 = file_name + FILE_SYSTEM_PREFIX_LEN (file_name);
+  char *cursor;                        /* points into the file name */

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

-  int saved_errno = errno;     /* remember caller's errno */

   int status;
 
   int status;
 

-  for (cursor = strchr (file_name, '/');
-       cursor;
-       cursor = strchr (cursor + 1, '/'))
+  for (cursor = cursor0; *cursor; cursor++)

     {
     {

+      mode_t mode;
+      mode_t desired_mode;
+
+      if (! ISSLASH (*cursor))
+       continue;
+

       /* Avoid mkdir of empty string, if leading or double '/'.  */
 
       /* Avoid mkdir of empty string, if leading or double '/'.  */
 

-      if (cursor == file_name || cursor[-1] == '/')
+      if (cursor == cursor0 || ISSLASH (cursor[-1]))

        continue;
 
        continue;
 

-      /* Avoid mkdir where last part of path is '.'.  */
+      /* Avoid mkdir where last part of file name is "." or "..".  */

 
 

-      if (cursor[-1] == '.' && (cursor == file_name + 1 || cursor[-2] == '/'))
+      if (cursor[-1] == '.'
+         && (cursor == cursor0 + 1 || ISSLASH (cursor[-2])
+             || (cursor[-2] == '.'
+                 && (cursor == cursor0 + 2 || ISSLASH (cursor[-3])))))

        continue;
 
        continue;
 

-      *cursor = '\0';          /* truncate the path there */
-      status = mkdir (file_name, ~newdir_umask & MODE_RWX);
+      *cursor = '\0';          /* truncate the name there */
+      desired_mode = MODE_RWX & ~ newdir_umask;
+      mode = desired_mode | (we_are_root ? 0 : MODE_WXUSR);
+      status = mkdir (file_name, mode);

 
       if (status == 0)
        {
 
       if (status == 0)
        {

-         print_for_mkdir (file_name, cursor - file_name,
-                          ~newdir_umask & MODE_RWX);
+         /* Create a struct delayed_set_stat even if
+            mode == desired_mode, because
+            repair_delayed_set_stat may need to update the struct.  */
+         delay_set_stat (file_name,
+                         0, mode & ~ current_umask, MODE_RWX,
+                         desired_mode, AT_SYMLINK_NOFOLLOW);
+
+         print_for_mkdir (file_name, cursor - file_name, desired_mode);

          did_something = 1;
 
          *cursor = '/';
          did_something = 1;
 
          *cursor = '/';


@@ -230,766 +531,1023 @@ make_directories (char *file_name)
 
       *cursor = '/';
 
 
       *cursor = '/';
 

-      if (errno == EEXIST
-#if MSDOS
-         /* Turbo C mkdir gives a funny errno.  */
-         || errno == EACCES
-#endif
-         )
-       /* Directory already exists.  */
+      if (errno == EEXIST)
+       continue;               /* Directory already exists.  */
+      else if ((errno == ENOSYS /* Automounted dirs on Solaris return
+                                  this. Reported by Warren Hyde
+                                  <Warren.Hyde@motorola.com> */
+              || ERRNO_IS_EACCES)  /* Turbo C mkdir gives a funny errno.  */
+              && access (file_name, W_OK) == 0)

        continue;
 
       /* Some other error in the mkdir.  We return to the caller.  */
       break;
     }
 
        continue;
 
       /* Some other error in the mkdir.  We return to the caller.  */
       break;
     }
 

-  errno = saved_errno;

   return did_something;                /* tell them to retry if we made one */
 }
 
   return did_something;                /* tell them to retry if we made one */
 }
 

-/*--------------------------------------------------------------------.
-| Unlink the destination, if we are supposed to do so.               |
-| Return zero if extraction should not proceed.                              |
-`--------------------------------------------------------------------*/
-
-static int
-unlink_destination (char const *file_name)
+static bool
+file_newer_p (const char *file_name, struct tar_stat_info *tar_stat)

 {
 {

-  if (unlink_first_option
-      && !remove_any_file (file_name, recursive_unlink_option)
-      && errno != ENOENT)
+  struct stat st;
+
+  if (stat (file_name, &st))

     {
     {

-      ERROR ((0, errno, _("Cannot remove %s"), file_name));
-      return 0;
+      if (errno != ENOENT)
+       {
+         stat_warn (file_name);
+         /* Be on the safe side: if the file does exist assume it is newer */
+         return true;
+       }
+      return false;

     }
     }

-
-  return 1;
+  if (!S_ISDIR (st.st_mode)
+      && tar_timespec_cmp (tar_stat->mtime, get_stat_mtime (&st)) <= 0)
+    {
+      return true;
+    }
+  return false;

 }
 
 }
 

-/*--------------------------------------------------------------------.
-| Attempt repairing what went wrong with the extraction.  Delete an   |
-| already existing file or create missing intermediate directories.   |
-| Return nonzero if we somewhat increased our chances at a successful |
-| extraction.  errno is properly restored on zero return.            |
-`--------------------------------------------------------------------*/
+#define RECOVER_NO 0
+#define RECOVER_OK 1
+#define RECOVER_SKIP 2
+
+/* Attempt repairing what went wrong with the extraction.  Delete an
+   already existing file or create missing intermediate directories.
+   Return RECOVER_OK if we somewhat increased our chances at a successful
+   extraction, RECOVER_NO if there are no chances, and RECOVER_SKIP if the
+   caller should skip extraction of that member.  The value of errno is
+   properly restored on returning RECOVER_NO.  */

 
 static int
 
 static int

-maybe_recoverable (char *file_name)
+maybe_recoverable (char *file_name, bool *interdir_made)

 {
 {

+  int e = errno;
+
+  if (*interdir_made)
+    return RECOVER_NO;
+

   switch (errno)
     {
     case EEXIST:
   switch (errno)
     {
     case EEXIST:

-      /* Attempt deleting an existing file.  However, with -k or -U, just stay
-        quiet.  */
+      /* Remove an old file, if the options allow this.  */

 
 

-      if (keep_old_files_option || unlink_first_option)
-       return 0;
+      switch (old_files_option)
+       {
+       case KEEP_OLD_FILES:
+         return RECOVER_SKIP;

 
 

-      return remove_any_file (file_name, 0);
+       case KEEP_NEWER_FILES:
+         if (file_newer_p (file_name, &current_stat_info))
+           {
+             errno = e;
+             return RECOVER_NO;
+           }
+         /* FALL THROUGH */
+
+       case DEFAULT_OLD_FILES:
+       case NO_OVERWRITE_DIR_OLD_FILES:
+       case OVERWRITE_OLD_FILES:
+         {
+           int r = remove_any_file (file_name, ORDINARY_REMOVE_OPTION);
+           errno = EEXIST;
+           return r > 0 ? RECOVER_OK : RECOVER_NO;
+         }
+
+       case UNLINK_FIRST_OLD_FILES:
+         break;
+       }

 
     case ENOENT:
       /* Attempt creating missing intermediate directories.  */
 
     case ENOENT:
       /* Attempt creating missing intermediate directories.  */

-
-      return make_directories (file_name);
+      if (! make_directories (file_name))
+       {
+         errno = ENOENT;
+         return RECOVER_NO;
+       }
+      *interdir_made = true;
+      return RECOVER_OK;

 
     default:
       /* Just say we can't do anything about it...  */
 
 
     default:
       /* Just say we can't do anything about it...  */
 

-      return 0;
+      return RECOVER_NO;

     }
 }
 
     }
 }
 

-/*---.
-| ?  |
-`---*/
-
+/* Fix the statuses of all directories whose statuses need fixing, and
+   which are not ancestors of FILE_NAME.  If AFTER_LINKS is
+   nonzero, do this for all such directories; otherwise, stop at the
+   first directory that is marked to be fixed up only after delayed
+   links are applied.  */

 static void
 static void

-extract_sparse_file (int fd, off_t *sizeleft, off_t totalsize, char *name)
+apply_nonancestor_delayed_set_stat (char const *file_name, bool after_links)

 {
 {

-  int sparse_ind = 0;
-  size_t written;
-  ssize_t count;
+  size_t file_name_len = strlen (file_name);
+  bool check_for_renamed_directories = 0;

 
 

-  /* assuming sizeleft is initially totalsize */
-
-  while (*sizeleft > 0)
+  while (delayed_set_stat_head)

     {
     {

-      union block *data_block = find_next_block ();
-      if (! data_block)
-       {
-         ERROR ((0, 0, _("Unexpected EOF on archive file")));
-         return;
-       }
-      if (lseek (fd, sparsearray[sparse_ind].offset, SEEK_SET) < 0)
-       {
-         char buf[UINTMAX_STRSIZE_BOUND];
-         ERROR ((0, errno, _("%s: lseek error at byte %s"),
-                 STRINGIFY_BIGINT (sparsearray[sparse_ind].offset, buf),
-                 name));
-         return;
-       }
-      written = sparsearray[sparse_ind++].numbytes;
-      while (written > BLOCKSIZE)
+      struct delayed_set_stat *data = delayed_set_stat_head;
+      bool skip_this_one = 0;
+      struct stat st;
+      mode_t current_mode = data->current_mode;
+      mode_t current_mode_mask = data->current_mode_mask;
+
+      check_for_renamed_directories |= data->after_links;
+
+      if (after_links < data->after_links
+         || (data->file_name_len < file_name_len
+             && file_name[data->file_name_len]
+             && (ISSLASH (file_name[data->file_name_len])
+                 || ISSLASH (file_name[data->file_name_len - 1]))
+             && memcmp (file_name, data->file_name, data->file_name_len) == 0))
+       break;
+
+      chdir_do (data->change_dir);
+
+      if (check_for_renamed_directories)

        {
        {

-         count = full_write (fd, data_block->buffer, BLOCKSIZE);
-         if (count < 0)
-           ERROR ((0, errno, _("%s: Could not write to file"), name));
-         written -= count;
-         *sizeleft -= count;
-         set_next_block_after (data_block);
-         data_block = find_next_block ();
-         if (! data_block)
+         if (fstatat (AT_FDCWD, data->file_name, &st, data->atflag) != 0)

            {
            {

-             ERROR ((0, 0, _("Unexpected EOF on archive file")));
-             return;
+             stat_error (data->file_name);
+             skip_this_one = 1;
+           }
+         else
+           {
+             current_mode = st.st_mode;
+             current_mode_mask = ALL_MODE_BITS;
+             if (! (st.st_dev == data->dev && st.st_ino == data->ino))
+               {
+                 ERROR ((0, 0,
+                         _("%s: Directory renamed before its status could be extracted"),
+                         quotearg_colon (data->file_name)));
+                 skip_this_one = 1;
+               }

            }
        }
 
            }
        }
 

-      count = full_write (fd, data_block->buffer, written);
-
-      if (count < 0)
-       ERROR ((0, errno, _("%s: Could not write to file"), name));
-      else if (count != written)
+      if (! skip_this_one)

        {
        {

-         char buf1[UINTMAX_STRSIZE_BOUND];
-         char buf2[UINTMAX_STRSIZE_BOUND];
-         ERROR ((0, 0, _("%s: Could only write %s of %s bytes"),
-                 name,
-                 STRINGIFY_BIGINT (totalsize - *sizeleft, buf1),
-                 STRINGIFY_BIGINT (totalsize, buf2)));
-         skip_file (*sizeleft);
+         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,
+                   -1, current_mode, current_mode_mask,
+                   DIRTYPE, data->interdir, data->atflag);

        }
 
        }
 

-      written -= count;
-      *sizeleft -= count;
-      set_next_block_after (data_block);
+      delayed_set_stat_head = data->next;
+      free (data);

     }
     }

-
-  free (sparsearray);

 }
 
 }
 

-/*----------------------------------.
-| Extract a file from the archive.  |
-`----------------------------------*/
+\f

 
 

-void
-extract_archive (void)
+/* Extractor functions for various member types */
+
+static int
+extract_dir (char *file_name, int typeflag)

 {
 {

-  union block *data_block;
-  int fd;

   int status;
   int status;

-  ssize_t sstatus;
-  size_t name_length;
-  size_t written;
-  int openflag;
-  off_t size;
-  int skipcrud;
-  int counter;
-  char typeflag;
-#if 0
-  int sparse_ind = 0;
-#endif
-  union block *exhdr;
-  struct delayed_set_stat *data;
-
-#define CURRENT_FILE_NAME (skipcrud + current_file_name)
-
-  set_next_block_after (current_header);
-  decode_header (current_header, &current_stat, &current_format, 1);
-
-  if (interactive_option && !confirm ("extract", current_file_name))
-    {
-      if (current_header->oldgnu_header.isextended)
-       skip_extended_headers ();
-      skip_file (current_stat.st_size);
-      return;
-    }
-
-  /* Print the block from `current_header' and `current_stat'.  */
-
-  if (verbose_option)
-    print_header ();
-
-  /* Check for fully specified file names and other atrocities.  */
-
-  skipcrud = 0;
-  while (!absolute_names_option && CURRENT_FILE_NAME[0] == '/')
+  mode_t mode;
+  mode_t current_mode = 0;
+  mode_t current_mode_mask = 0;
+  int atflag = 0;
+  bool interdir_made = false;
+
+  /* Save 'root device' to avoid purging mount points. */
+  if (one_file_system_option && root_device == 0)

     {
     {

-      static int warned_once;
+      struct stat st;

 
 

-      if (!warned_once)
-       {
-         warned_once = 1;
-         WARN ((0, 0, _("Removing leading `/' from archive names")));
-       }
-      skipcrud++;              /* force relative path */
+      if (stat (".", &st) != 0)
+       stat_diag (".");
+      else
+       root_device = st.st_dev;

     }
 
     }
 

-  /* Take a safety backup of a previously existing file.  */
-
-  if (backup_option && !to_stdout_option)
-    if (!maybe_backup_file (CURRENT_FILE_NAME, 0))
-      {
-       ERROR ((0, errno, _("%s: Was unable to backup this file"),
-               CURRENT_FILE_NAME));
-       if (current_header->oldgnu_header.isextended)
-         skip_extended_headers ();
-       skip_file (current_stat.st_size);
-       return;
-      }
-
-  /* Extract the archive entry according to its type.  */
-
-  typeflag = current_header->header.typeflag;
-  switch (typeflag)
+  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 ownership or permissions will be restored later, create the
+     directory with restrictive permissions at first, so that in the
+     meantime processes owned by other users do not inadvertently
+     create files under this directory that inherit the wrong owner,
+     group, or permissions from the directory.  If not root, though,
+     make the directory writeable and searchable at first, so that
+     files can be created under it.  */
+  mode = ((current_stat_info.stat.st_mode
+          & (0 < same_owner_option || 0 < same_permissions_option
+             ? S_IRWXU
+             : MODE_RWX))
+         | (we_are_root ? 0 : MODE_WXUSR));
+
+  for (;;)

     {
     {

-      /* JK - What we want to do if the file is sparse is loop through
-        the array of sparse structures in the header and read in and
-        translate the character strings representing 1) the offset at
-        which to write and 2) how many bytes to write into numbers,
-        which we store into the scratch array, "sparsearray".  This
-        array makes our life easier the same way it did in creating the
-        tar file that had to deal with a sparse file.
-
-        After we read in the first five (at most) sparse structures, we
-        check to see if the file has an extended header, i.e., if more
-        sparse structures are needed to describe the contents of the new
-        file.  If so, we read in the extended headers and continue to
-        store their contents into the sparsearray.  */
-
-    case GNUTYPE_SPARSE:
-      sp_array_size = 10;
-      sparsearray =
-       xmalloc (sp_array_size * sizeof (struct sp_array));
-
-      for (counter = 0; counter < SPARSES_IN_OLDGNU_HEADER; counter++)
+      status = mkdir (file_name, mode);
+      if (status == 0)

        {
        {

-         struct sparse const *s = &current_header->oldgnu_header.sp[counter];
-         sparsearray[counter].offset = OFF_FROM_HEADER (s->offset);
-         sparsearray[counter].numbytes = SIZE_FROM_HEADER (s->numbytes);
-         if (!sparsearray[counter].numbytes)
-           break;
+         current_mode = mode & ~ current_umask;
+         current_mode_mask = MODE_RWX;
+         atflag = AT_SYMLINK_NOFOLLOW;
+         break;

        }
 
        }
 

-      if (current_header->oldgnu_header.isextended)
+      if (errno == EEXIST
+         && (interdir_made
+             || old_files_option == DEFAULT_OLD_FILES
+             || old_files_option == OVERWRITE_OLD_FILES))

        {
        {

-         /* Read in the list of extended headers and translate them
-            into the sparsearray as before.  Note that this
-            invalidates current_header.  */
-
-         /* static */ int ind = SPARSES_IN_OLDGNU_HEADER;
-
-         while (1)
+         struct stat st;
+         if (stat (file_name, &st) == 0)

            {
            {

-             exhdr = find_next_block ();
-             if (! exhdr)
-               {
-                 ERROR ((0, 0, _("Unexpected EOF on archive file")));
-                 return;
-               }
-             for (counter = 0; counter < SPARSES_IN_SPARSE_HEADER; counter++)
+             current_mode = st.st_mode;
+             current_mode_mask = ALL_MODE_BITS;
+
+             if (S_ISDIR (current_mode))

                {
                {

-                 struct sparse const *s = &exhdr->sparse_header.sp[counter];
-                 if (counter + ind > sp_array_size - 1)
+                 if (interdir_made)

                    {
                    {

-                     /* Realloc the scratch area since we've run out of
-                        room.  */
-
-                     sp_array_size *= 2;
-                     sparsearray =
-                       xrealloc (sparsearray,
-                                 sp_array_size * sizeof (struct sp_array));
+                     repair_delayed_set_stat (file_name, &st);
+                     return 0;

                    }
                    }

-                 if (s->numbytes[0] == 0)
-                   break;
-                 sparsearray[counter + ind].offset =
-                   OFF_FROM_HEADER (s->offset);
-                 sparsearray[counter + ind].numbytes =
-                   SIZE_FROM_HEADER (s->numbytes);
-               }
-             if (!exhdr->sparse_header.isextended)
-               break;
-             else
-               {
-                 ind += SPARSES_IN_SPARSE_HEADER;
-                 set_next_block_after (exhdr);
+                 break;

                }
            }
                }
            }

-         set_next_block_after (exhdr);
+         errno = EEXIST;

        }
        }

-      /* Fall through.  */
-
-    case AREGTYPE:
-    case REGTYPE:
-    case CONTTYPE:

 
 

-      /* Appears to be a file.  But BSD tar uses the convention that a slash
-        suffix means a directory.  */
+      switch (maybe_recoverable (file_name, &interdir_made))
+       {
+       case RECOVER_OK:
+         continue;

 
 

-      name_length = strlen (CURRENT_FILE_NAME) - 1;
-      if (CURRENT_FILE_NAME[name_length] == '/')
-       goto really_dir;
+       case RECOVER_SKIP:
+         break;

 
 

-      /* FIXME: deal with protection issues.  */
+       case RECOVER_NO:
+         if (errno != EEXIST)
+           {
+             mkdir_error (file_name);
+             return 1;
+           }
+         break;
+       }
+      break;
+    }

 
 

-    again_file:
-      openflag = (keep_old_files_option || unlink_first_option ?
-                 O_WRONLY | O_BINARY | O_NONBLOCK | O_CREAT | O_EXCL :
-                 O_WRONLY | O_BINARY | O_NONBLOCK | O_CREAT | O_TRUNC)
-       | ((typeflag == GNUTYPE_SPARSE) ? 0 : O_APPEND);
+  if (status == 0
+      || old_files_option == DEFAULT_OLD_FILES
+      || old_files_option == OVERWRITE_OLD_FILES)
+    delay_set_stat (file_name, &current_stat_info,
+                   current_mode, current_mode_mask,
+                   current_stat_info.stat.st_mode, atflag);
+  return status;
+}

 
 

-      /* JK - The last | is a kludge to solve the problem the O_APPEND
-        flag causes with files we are trying to make sparse: when a file
-        is opened with O_APPEND, it writes to the last place that
-        something was written, thereby ignoring any lseeks that we have
-        done.  We add this extra condition to make it able to lseek when
-        a file is sparse, i.e., we don't open the new file with this
-        flag.  (Grump -- this bug caused me to waste a good deal of
-        time, I might add)  */

 
 

-      if (to_stdout_option)
-       {
-         fd = 1;
-         goto extract_file;
-       }

 
 

-      if (!unlink_destination (CURRENT_FILE_NAME))
-       {
-         if (current_header->oldgnu_header.isextended)
-           skip_extended_headers ();
-         skip_file (current_stat.st_size);
-         if (backup_option)
-           undo_last_backup ();
-         break;
-       }
+static int
+open_output_file (char const *file_name, int typeflag, mode_t mode,
+                 mode_t *current_mode, mode_t *current_mode_mask)
+{
+  int fd;
+  bool overwriting_old_files = old_files_option == OVERWRITE_OLD_FILES;
+  int openflag = (O_WRONLY | O_BINARY | O_CREAT
+                 | (overwriting_old_files ? O_TRUNC : O_EXCL));

 
 #if O_CTG
 
 #if O_CTG

-      /* Contiguous files (on the Masscomp) have to specify the size in
-        the open call that creates them.  */
+  /* Contiguous files (on the Masscomp) have to specify the size in
+     the open call that creates them.  */

 
 

-      if (typeflag == CONTTYPE)
-       fd = open (CURRENT_FILE_NAME, openflag | O_CTG,
-                  current_stat.st_mode, current_stat.st_size);
-      else
-       fd = open (CURRENT_FILE_NAME, openflag, current_stat.st_mode);
+  if (typeflag == CONTTYPE)
+    fd = open (file_name, openflag | O_CTG, mode, current_stat_info.stat.st_size);
+  else
+    fd = open (file_name, openflag, mode);

 
 #else /* not O_CTG */
 
 #else /* not O_CTG */

-      if (typeflag == CONTTYPE)
-       {
-         static int conttype_diagnosed;
+  if (typeflag == CONTTYPE)
+    {
+      static int conttype_diagnosed;

 
 

-         if (!conttype_diagnosed)
-           {
-             conttype_diagnosed = 1;
-             WARN ((0, 0, _("Extracting contiguous files as regular files")));
-           }
+      if (!conttype_diagnosed)
+       {
+         conttype_diagnosed = 1;
+         WARNOPT (WARN_CONTIGUOUS_CAST,
+                  (0, 0, _("Extracting contiguous files as regular files")));

        }
        }

-      fd = open (CURRENT_FILE_NAME, openflag, current_stat.st_mode);
+    }
+  fd = open (file_name, openflag, mode);

 
 #endif /* not O_CTG */
 
 
 #endif /* not O_CTG */
 

-      if (fd < 0)
-       {
-         if (maybe_recoverable (CURRENT_FILE_NAME))
-           goto again_file;
-
-         ERROR ((0, errno, _("%s: Could not create file"),
-                 CURRENT_FILE_NAME));
-         if (current_header->oldgnu_header.isextended)
-           skip_extended_headers ();
-         skip_file (current_stat.st_size);
-         if (backup_option)
-           undo_last_backup ();
-         break;
-       }
-
-    extract_file:
-      if (typeflag == GNUTYPE_SPARSE)
+  if (0 <= fd)
+    {
+      if (overwriting_old_files)

        {
        {

-         char *name;
-         size_t name_length_bis;
-
-         /* Kludge alert.  NAME is assigned to header.name because
-            during the extraction, the space that contains the header
-            will get scribbled on, and the name will get munged, so any
-            error messages that happen to contain the filename will look
-            REAL interesting unless we do this.  */
-
-         name_length_bis = strlen (CURRENT_FILE_NAME) + 1;
-         name = xmalloc (name_length_bis);
-         memcpy (name, CURRENT_FILE_NAME, name_length_bis);
-         size = current_stat.st_size;
-         extract_sparse_file (fd, &size, current_stat.st_size, name);
+         struct stat st;
+         if (fstat (fd, &st) != 0)
+           {
+             int e = errno;
+             close (fd);
+             errno = e;
+             return -1;
+           }
+         if (! S_ISREG (st.st_mode))
+           {
+             close (fd);
+             errno = EEXIST;
+             return -1;
+           }
+         *current_mode = st.st_mode;
+         *current_mode_mask = ALL_MODE_BITS;

        }
       else
        }
       else

-       for (size = current_stat.st_size;
-            size > 0;
-            size -= written)
-         {
-           if (multi_volume_option)
-             {
-               assign_string (&save_name, current_file_name);
-               save_totsize = current_stat.st_size;
-               save_sizeleft = 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 on archive file")));
-               break;          /* FIXME: What happens, then?  */
-             }
-
-           written = available_space_after (data_block);
-
-           if (written > size)
-             written = size;
-           errno = 0;
-           sstatus = full_write (fd, data_block->buffer, written);
-
-           set_next_block_after ((union block *)
-                                 (data_block->buffer + written - 1));
-           if (sstatus == written)
-             continue;
-
-           /* Error in writing to file.  Print it, skip to next file in
-              archive.  */
-
-           if (sstatus < 0)
-             ERROR ((0, errno, _("%s: Could not write to file"),
-                     CURRENT_FILE_NAME));
-           else
-             ERROR ((0, 0, _("%s: Could only write %lu of %lu bytes"),
-                     CURRENT_FILE_NAME,
-                     (unsigned long) sstatus,
-                     (unsigned long) written));
-           skip_file (size - written);
-           break;              /* still do the close, mod time, chmod, etc */
-         }
-
-      if (multi_volume_option)
-       assign_string (&save_name, 0);
-
-      /* 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 (to_stdout_option)
-       break;
-
-      status = close (fd);
-      if (status < 0)

        {
        {

-         ERROR ((0, errno, _("%s: Error while closing"), CURRENT_FILE_NAME));
-         if (backup_option)
-           undo_last_backup ();
+         *current_mode = mode & ~ current_umask;
+         *current_mode_mask = MODE_RWX;

        }
        }

+    }

 
 

-      set_stat (CURRENT_FILE_NAME, &current_stat, 0);
-      break;
+  return fd;
+}

 
 

-    case SYMTYPE:
-      if (to_stdout_option)
-       break;
+static int
+extract_file (char *file_name, int typeflag)
+{
+  int fd;
+  off_t size;
+  union block *data_block;
+  int status;
+  size_t count;
+  size_t written;
+  bool interdir_made = false;
+  mode_t mode = (current_stat_info.stat.st_mode & MODE_RWX
+                & ~ (0 < same_owner_option ? S_IRWXG | S_IRWXO : 0));
+  mode_t current_mode = 0;
+  mode_t current_mode_mask = 0;
+
+  if (to_stdout_option)
+    fd = STDOUT_FILENO;
+  else if (to_command_option)
+    {
+      fd = sys_exec_command (file_name, 'f', &current_stat_info);
+      if (fd < 0)
+       {
+         skip_member ();
+         return 0;
+       }
+    }
+  else
+    {
+      int recover = RECOVER_NO;
+      do
+       fd = open_output_file (file_name, typeflag, mode,
+                              &current_mode, &current_mode_mask);
+      while (fd < 0
+            && (recover = maybe_recoverable (file_name, &interdir_made))
+                == RECOVER_OK);

 
 

-#ifdef HAVE_SYMLINK
-      if (!unlink_destination (CURRENT_FILE_NAME))
-       break;
+      if (fd < 0)
+       {
+         skip_member ();
+         if (recover == RECOVER_SKIP)
+           return 0;
+         open_error (file_name);
+         return 1;
+       }
+    }

 
 

-      while (status = symlink (current_link_name, CURRENT_FILE_NAME),
-            status != 0)
-       if (!maybe_recoverable (CURRENT_FILE_NAME))
-         break;
+  mv_begin_read (&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; )
+      {
+       mv_size_left (size);

 
 

-      if (status == 0)
+       /* Locate data, determine max length writeable, write it,
+          block that we have used the data, then check if the write
+          worked.  */

 
 

-       /* Setting the attributes of symbolic links might, on some systems,
-          change the pointed to file, instead of the symbolic link itself.
-          At least some of these systems have a lchown call, and the
-          set_stat routine knows about this.    */
+       data_block = find_next_block ();
+       if (! data_block)
+         {
+           ERROR ((0, 0, _("Unexpected EOF in archive")));
+           break;              /* FIXME: What happens, then?  */
+         }

 
 

-       set_stat (CURRENT_FILE_NAME, &current_stat, 1);
+       written = available_space_after (data_block);

 
 

-      else
-       {
-         ERROR ((0, errno, _("%s: Could not create symlink to `%s'"),
-                 CURRENT_FILE_NAME, current_link_name));
-         if (backup_option)
-           undo_last_backup ();
-       }
-      break;
+       if (written > size)
+         written = size;
+       errno = 0;
+       count = full_write (fd, data_block->buffer, written);
+       size -= written;

 
 

-#else
-      {
-       static int warned_once;
-
-       if (!warned_once)
+       set_next_block_after ((union block *)
+                             (data_block->buffer + written - 1));
+       if (count != written)

          {
          {

-           warned_once = 1;
-           WARN ((0, 0,
-                  _("Attempting extraction of symbolic links as hard links")));
+           if (!to_command_option)
+             write_error_details (file_name, count, written);
+           /* FIXME: shouldn't we restore from backup? */
+           break;

          }
       }
          }
       }

-      /* Fall through.  */

 
 

-#endif
+  skip_file (size);

 
 

-    case LNKTYPE:
-      if (to_stdout_option)
-       break;
+  mv_end ();

 
 

-      if (!unlink_destination (CURRENT_FILE_NAME))
-       break;
+  /* 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.  */

 
 

-    again_link:
-      {
-       struct stat st1, st2;
+  if (to_stdout_option)
+    return 0;

 
 

-       /* MSDOS does not implement links.  However, djgpp's link() actually
-          copies the file.  */
-       status = link (current_link_name, CURRENT_FILE_NAME);
+  if (! to_command_option)
+    set_stat (file_name, &current_stat_info, fd,
+             current_mode, current_mode_mask, typeflag, false,
+             (old_files_option == OVERWRITE_OLD_FILES
+              ? 0 : AT_SYMLINK_NOFOLLOW));

 
 

-       if (status == 0)
-         break;
-       if (maybe_recoverable (CURRENT_FILE_NAME))
-         goto again_link;
+  status = close (fd);
+  if (status < 0)
+    close_error (file_name);

 
 

-       if (incremental_option && errno == EEXIST)
-         break;
-       if (stat (current_link_name, &st1) == 0
-           && stat (CURRENT_FILE_NAME, &st2) == 0
-           && st1.st_dev == st2.st_dev
-           && st1.st_ino == st2.st_ino)
-         break;
+  if (to_command_option)
+    sys_wait_command ();

 
 

-       ERROR ((0, errno, _("%s: Could not link to `%s'"),
-               CURRENT_FILE_NAME, current_link_name));
-       if (backup_option)
-         undo_last_backup ();
-      }
-      break;
+  return status;
+}

 
 

-#if S_IFCHR
-    case CHRTYPE:
-      current_stat.st_mode |= S_IFCHR;
-      goto make_node;
-#endif
+/* Create a placeholder file with name FILE_NAME, which will be
+   replaced after other extraction is done by a symbolic link if
+   IS_SYMLINK is true, and by a hard link otherwise.  Set
+   *INTERDIR_MADE if an intermediate directory is made in the
+   process.  */

 
 

-#if S_IFBLK
-    case BLKTYPE:
-      current_stat.st_mode |= S_IFBLK;
-#endif
+static int
+create_placeholder_file (char *file_name, bool is_symlink, bool *interdir_made)
+{
+  int fd;
+  struct stat st;

 
 

-#if S_IFCHR || S_IFBLK
-    make_node:
-      if (to_stdout_option)
-       break;
+  while ((fd = open (file_name, O_WRONLY | O_CREAT | O_EXCL, 0)) < 0)
+    {
+      switch (maybe_recoverable (file_name, interdir_made))
+       {
+       case RECOVER_OK:
+         continue;

 
 

-      if (!unlink_destination (CURRENT_FILE_NAME))
-       break;
+       case RECOVER_SKIP:
+         return 0;
+
+       case RECOVER_NO:
+         open_error (file_name);
+         return -1;
+       }
+      }

 
 

-      status = mknod (CURRENT_FILE_NAME, current_stat.st_mode,
-                     current_stat.st_rdev);
-      if (status != 0)
+  if (fstat (fd, &st) != 0)
+    {
+      stat_error (file_name);
+      close (fd);
+    }
+  else if (close (fd) != 0)
+    close_error (file_name);
+  else
+    {
+      struct delayed_set_stat *h;
+      struct delayed_link *p =
+       xmalloc (offsetof (struct delayed_link, target)
+                + strlen (current_stat_info.link_name)
+                + 1);
+      p->next = delayed_link_head;
+      delayed_link_head = p;
+      p->dev = st.st_dev;
+      p->ino = st.st_ino;
+      p->ctime = get_stat_ctime (&st);
+      p->is_symlink = is_symlink;
+      if (is_symlink)

        {
        {

-         if (maybe_recoverable (CURRENT_FILE_NAME))
-           goto make_node;
+         p->mode = current_stat_info.stat.st_mode;
+         p->uid = current_stat_info.stat.st_uid;
+         p->gid = current_stat_info.stat.st_gid;
+         p->atime = current_stat_info.atime;
+         p->mtime = current_stat_info.mtime;
+       }
+      p->change_dir = chdir_current;
+      p->sources = xmalloc (offsetof (struct string_list, string)
+                           + strlen (file_name) + 1);
+      p->sources->next = 0;
+      strcpy (p->sources->string, file_name);
+      strcpy (p->target, current_stat_info.link_name);
+
+      h = delayed_set_stat_head;
+      if (h && ! h->after_links
+         && strncmp (file_name, h->file_name, h->file_name_len) == 0
+         && ISSLASH (file_name[h->file_name_len])
+         && (last_component (file_name) == file_name + h->file_name_len + 1))
+       mark_after_links (h);

 
 

-         ERROR ((0, errno, _("%s: Could not make node"), CURRENT_FILE_NAME));
-         if (backup_option)
-           undo_last_backup ();
-         break;
-       };
-      set_stat (CURRENT_FILE_NAME, &current_stat, 0);
-      break;
-#endif
+      return 0;
+    }

 
 

-#if HAVE_MKFIFO || defined mkfifo
-    case FIFOTYPE:
-      if (to_stdout_option)
-       break;
+  return -1;
+}

 
 

-      if (!unlink_destination (CURRENT_FILE_NAME))
-       break;
+static int
+extract_link (char *file_name, int typeflag)
+{
+  bool interdir_made = false;
+  char const *link_name;
+  int rc;

 
 

-      while (status = mkfifo (CURRENT_FILE_NAME, current_stat.st_mode),
-            status != 0)
-       if (!maybe_recoverable (CURRENT_FILE_NAME))
-         break;
+  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);
+
+  do
+    {
+      struct stat st1, st2;
+      int e;
+      int status = link (link_name, file_name);
+      e = errno;

 
       if (status == 0)
 
       if (status == 0)

-       set_stat (CURRENT_FILE_NAME, &current_stat, 0);
-      else

        {
        {

-         ERROR ((0, errno, _("%s: Could not make fifo"), CURRENT_FILE_NAME));
-         if (backup_option)
-           undo_last_backup ();
+         struct delayed_link *ds = delayed_link_head;
+         if (ds && lstat (link_name, &st1) == 0)
+           for (; ds; ds = ds->next)
+             if (ds->change_dir == chdir_current
+                 && ds->dev == st1.st_dev
+                 && ds->ino == st1.st_ino
+                 && timespec_cmp (ds->ctime, get_stat_ctime (&st1)) == 0)
+               {
+                 struct string_list *p =  xmalloc (offsetof (struct string_list, string)
+                                                   + strlen (file_name) + 1);
+                 strcpy (p->string, file_name);
+                 p->next = ds->sources;
+                 ds->sources = p;
+                 break;
+               }
+         return 0;

        }
        }

-      break;
+      else if ((e == EEXIST && strcmp (link_name, file_name) == 0)
+              || (lstat (link_name, &st1) == 0
+                  && lstat (file_name, &st2) == 0
+                  && st1.st_dev == st2.st_dev
+                  && st1.st_ino == st2.st_ino))
+       return 0;
+
+      errno = e;
+    }
+  while ((rc = maybe_recoverable (file_name, &interdir_made)) == RECOVER_OK);
+
+  if (rc == RECOVER_SKIP)
+    return 0;
+  if (!(incremental_option && errno == EEXIST))
+    {
+      link_error (link_name, file_name);
+      return 1;
+    }
+  return 0;
+}
+
+static int
+extract_symlink (char *file_name, int typeflag)
+{
+#ifdef HAVE_SYMLINK
+  bool interdir_made = false;
+
+  if (! absolute_names_option
+      && (IS_ABSOLUTE_FILE_NAME (current_stat_info.link_name)
+         || contains_dot_dot (current_stat_info.link_name)))
+    return create_placeholder_file (file_name, true, &interdir_made);
+
+  while (symlink (current_stat_info.link_name, file_name))
+    switch (maybe_recoverable (file_name, &interdir_made))
+      {
+      case RECOVER_OK:
+       continue;
+
+      case RECOVER_SKIP:
+       return 0;
+
+      case RECOVER_NO:
+       symlink_error (current_stat_info.link_name, file_name);
+       return -1;
+      }
+
+  set_stat (file_name, &current_stat_info, -1, 0, 0,
+           SYMTYPE, false, AT_SYMLINK_NOFOLLOW);
+  return 0;
+
+#else
+  static int warned_once;
+
+  if (!warned_once)
+    {
+      warned_once = 1;
+      WARNOPT (WARN_SYMBOLIC_CAST,
+              (0, 0,
+               _("Attempting extraction of symbolic links as hard links")));
+    }
+  return extract_link (file_name, typeflag);

 #endif
 #endif

+}

 
 

-    case DIRTYPE:
-    case GNUTYPE_DUMPDIR:
-      name_length = strlen (CURRENT_FILE_NAME) - 1;
+#if S_IFCHR || S_IFBLK
+static int
+extract_node (char *file_name, int typeflag)
+{
+  bool interdir_made = false;
+  mode_t mode = (current_stat_info.stat.st_mode & MODE_RWX
+                & ~ (0 < same_owner_option ? S_IRWXG | S_IRWXO : 0));

 
 

-    really_dir:
-      /* Check for trailing /, and zap as many as we find.  */
-      while (name_length && CURRENT_FILE_NAME[name_length] == '/')
-       CURRENT_FILE_NAME[name_length--] = '\0';
+  while (mknod (file_name, mode, current_stat_info.stat.st_rdev) != 0)
+    switch (maybe_recoverable (file_name, &interdir_made))
+      {
+      case RECOVER_OK:
+       continue;

 
 

-      if (incremental_option)
-       {
-         /* Read the entry and delete files that aren't listed in the
-            archive.  */
+      case RECOVER_SKIP:
+       return 0;

 
 

-         gnu_restore (skipcrud);
-       }
-      else if (typeflag == GNUTYPE_DUMPDIR)
-       skip_file (current_stat.st_size);
+      case RECOVER_NO:
+       mknod_error (file_name);
+       return -1;
+      }

 
 

-      if (to_stdout_option)
-       break;
+  set_stat (file_name, &current_stat_info, -1,
+           mode & ~ current_umask, MODE_RWX,
+           typeflag, false, AT_SYMLINK_NOFOLLOW);
+  return 0;
+}
+#endif

 
 

-    again_dir:
-      status = mkdir (CURRENT_FILE_NAME,
-                     ((we_are_root ? 0 : MODE_WXUSR)
-                      | current_stat.st_mode));
-      if (status != 0)
-       {
-         /* If the directory creation fails, let's consider immediately the
-            case where the directory already exists.  We have three good
-            reasons for clearing out this case before attempting recovery.
-
-            1) It would not be efficient recovering the error by deleting
-            the directory in maybe_recoverable, then recreating it right
-            away.  We only hope we will be able to adjust its permissions
-            adequately, later.
-
-            2) Removing the directory might fail if it is not empty.  By
-            exception, this real error is traditionally not reported.
-
-            3) Let's suppose `DIR' already exists and we are about to
-            extract `DIR/../DIR'.  This would fail because the directory
-            already exists, and maybe_recoverable would react by removing
-            `DIR'.  This then would fail again because there are missing
-            intermediate directories, and maybe_recoverable would react by
-            creating `DIR'.  We would then have an extraction loop.  */
-
-         if (errno == EEXIST)
-           {
-             struct stat st1;
-             int saved_errno = errno;
+#if HAVE_MKFIFO || defined mkfifo
+static int
+extract_fifo (char *file_name, int typeflag)
+{
+  bool interdir_made = false;
+  mode_t mode = (current_stat_info.stat.st_mode & MODE_RWX
+                & ~ (0 < same_owner_option ? S_IRWXG | S_IRWXO : 0));

 
 

-             if (stat (CURRENT_FILE_NAME, &st1) == 0 && S_ISDIR (st1.st_mode))
-               goto check_perms;
+  while (mkfifo (file_name, mode) != 0)
+    switch (maybe_recoverable (file_name, &interdir_made))
+      {
+      case RECOVER_OK:
+       continue;

 
 

-             errno = saved_errno;
-           }
+      case RECOVER_SKIP:
+       return 0;

 
 

-         if (maybe_recoverable (CURRENT_FILE_NAME))
-           goto again_dir;
+      case RECOVER_NO:
+       mkfifo_error (file_name);
+       return -1;
+      }

 
 

-         /* If we're trying to create '.', let it be.  */
+  set_stat (file_name, &current_stat_info, -1,
+           mode & ~ current_umask, MODE_RWX,
+           typeflag, false, AT_SYMLINK_NOFOLLOW);
+  return 0;
+}
+#endif

 
 

-         /* FIXME: Strange style...  */
+static int
+extract_volhdr (char *file_name, int typeflag)
+{
+  skip_member ();
+  return 0;
+}

 
 

-         if (CURRENT_FILE_NAME[name_length] == '.'
-             && (name_length == 0
-                 || CURRENT_FILE_NAME[name_length - 1] == '/'))
-           goto check_perms;
+static int
+extract_failure (char *file_name, int typeflag)
+{
+  return 1;
+}

 
 

-         ERROR ((0, errno, _("%s: Could not create directory"),
-                 CURRENT_FILE_NAME));
-         if (backup_option)
-           undo_last_backup ();
-         break;
-       }
+typedef int (*tar_extractor_t) (char *file_name, int typeflag);

 
 

-    check_perms:
-      if (!we_are_root && MODE_WXUSR != (MODE_WXUSR & current_stat.st_mode))
-       {
-         current_stat.st_mode |= MODE_WXUSR;
-         WARN ((0, 0, _("Added write and execute permission to directory %s"),
-                CURRENT_FILE_NAME));
-       }
+\f

 
 

-#if !MSDOS
-      /* MSDOS does not associate time stamps with directories.   In this
-        case, no need to try delaying their restoration.  */
+/* Prepare to extract a file. Find extractor function.
+   Return zero if extraction should not proceed.  */

 
 

-      if (touch_option)
+static int
+prepare_to_extract (char const *file_name, int typeflag, tar_extractor_t *fun)
+{
+  int rc = 1;

 
 

-       /* FIXME: I do not believe in this.  Ignoring time stamps does not
-          alleviate the need of delaying the restoration of directories'
-          mode.  Let's ponder this for a little while.  */
+  if (EXTRACT_OVER_PIPE)
+    rc = 0;

 
 

-       set_mode (CURRENT_FILE_NAME, &current_stat);
+  /* Select the extractor */
+  switch (typeflag)
+    {
+    case GNUTYPE_SPARSE:
+      *fun = extract_file;
+      rc = 1;
+      break;

 
 

+    case AREGTYPE:
+    case REGTYPE:
+    case CONTTYPE:
+      /* Appears to be a file.  But BSD tar uses the convention that a slash
+        suffix means a directory.  */
+      if (current_stat_info.had_trailing_slash)
+       *fun = extract_dir;

       else
        {
       else
        {

-         data = xmalloc (sizeof (struct delayed_set_stat));
-         data->file_name = xstrdup (CURRENT_FILE_NAME);
-         data->stat_info = current_stat;
-         data->next = delayed_set_stat_head;
-         delayed_set_stat_head = data;
+         *fun = extract_file;
+         rc = 1;

        }
        }

-#endif /* !MSDOS */

       break;
 
       break;
 

-    case GNUTYPE_VOLHDR:
-      if (verbose_option)
-       fprintf (stdlis, _("Reading %s\n"), current_file_name);
+    case SYMTYPE:
+      *fun = extract_symlink;

       break;
 
       break;
 

-    case GNUTYPE_NAMES:
-      extract_mangle ();
+    case LNKTYPE:
+      *fun = extract_link;
+      break;
+
+#if S_IFCHR
+    case CHRTYPE:
+      current_stat_info.stat.st_mode |= S_IFCHR;
+      *fun = extract_node;
+      break;
+#endif
+
+#if S_IFBLK
+    case BLKTYPE:
+      current_stat_info.stat.st_mode |= S_IFBLK;
+      *fun = extract_node;
+      break;
+#endif
+
+#if HAVE_MKFIFO || defined mkfifo
+    case FIFOTYPE:
+      *fun = extract_fifo;
+      break;
+#endif
+
+    case DIRTYPE:
+    case GNUTYPE_DUMPDIR:
+      *fun = extract_dir;
+      if (current_stat_info.is_dumpdir)
+       delay_directory_restore_option = true;
+      break;
+
+    case GNUTYPE_VOLHDR:
+      *fun = extract_volhdr;

       break;
 
     case GNUTYPE_MULTIVOL:
       ERROR ((0, 0,
       break;
 
     case GNUTYPE_MULTIVOL:
       ERROR ((0, 0,

-             _("Cannot extract `%s' -- file is continued from another volume"),
-             current_file_name));
-      skip_file (current_stat.st_size);
-      if (backup_option)
-       undo_last_backup ();
+             _("%s: Cannot extract -- file is continued from another volume"),
+             quotearg_colon (current_stat_info.file_name)));
+      *fun = extract_failure;

       break;
 
     case GNUTYPE_LONGNAME:
     case GNUTYPE_LONGLINK:
       break;
 
     case GNUTYPE_LONGNAME:
     case GNUTYPE_LONGLINK:

-      ERROR ((0, 0, _("Visible long name error")));
-      skip_file (current_stat.st_size);
-      if (backup_option)
-       undo_last_backup ();
+      ERROR ((0, 0, _("Unexpected long name header")));
+      *fun = extract_failure;

       break;
 
     default:
       break;
 
     default:

-      WARN ((0, 0,
-            _("Unknown file type '%c' for %s, extracted as normal file"),
-            typeflag, CURRENT_FILE_NAME));
-      goto again_file;
+      WARNOPT (WARN_UNKNOWN_CAST,
+              (0, 0,
+               _("%s: Unknown file type `%c', extracted as normal file"),
+               quotearg_colon (file_name), typeflag));
+      *fun = extract_file;

     }
 
     }
 

-#undef CURRENT_FILE_NAME
+  /* Determine whether the extraction should proceed */
+  if (rc == 0)
+    return 0;
+
+  switch (old_files_option)
+    {
+    case UNLINK_FIRST_OLD_FILES:
+      if (!remove_any_file (file_name,
+                            recursive_unlink_option ? RECURSIVE_REMOVE_OPTION
+                                                      : ORDINARY_REMOVE_OPTION)
+         && errno && errno != ENOENT)
+       {
+         unlink_error (file_name);
+         return 0;
+       }
+      break;
+
+    case KEEP_NEWER_FILES:
+      if (file_newer_p (file_name, &current_stat_info))
+       {
+         WARNOPT (WARN_IGNORE_NEWER,
+                  (0, 0, _("Current %s is newer or same age"),
+                   quote (file_name)));
+         return 0;
+       }
+      break;
+
+    default:
+      break;
+    }
+
+  return 1;

 }
 
 }
 

-/*----------------------------------------------------------------.
-| Set back the utime and mode for all the extracted directories.  |
-`----------------------------------------------------------------*/
+/* Extract a file from the archive.  */
+void
+extract_archive (void)
+{
+  char typeflag;
+  tar_extractor_t fun;
+
+  fatal_exit_hook = extract_finish;
+
+  set_next_block_after (current_header);
+
+  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.  */
+  if (verbose_option)
+    print_header (&current_stat_info, current_header, -1);
+
+  /* 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)
+    {
+      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.  */
+
+  if (backup_option)
+    if (!maybe_backup_file (current_stat_info.file_name, 0))
+      {
+       int e = errno;
+       ERROR ((0, e, _("%s: Was unable to backup this file"),
+               quotearg_colon (current_stat_info.file_name)));
+       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;
+
+  if (prepare_to_extract (current_stat_info.file_name, typeflag, &fun))
+    {
+      if (fun && (*fun) (current_stat_info.file_name, typeflag)
+         && backup_option)
+       undo_last_backup ();
+    }
+  else
+    skip_member ();
+
+}
+
+/* Extract the links whose final extraction were delayed.  */
+static void
+apply_delayed_links (void)
+{
+  struct delayed_link *ds;
+
+  for (ds = delayed_link_head; ds; )
+    {
+      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;
+         struct stat st;
+
+         /* Make sure the placeholder file is still there.  If not,
+            don't create a link, as the placeholder was probably
+            removed by a later extraction.  */
+         if (lstat (source, &st) == 0
+             && st.st_dev == ds->dev
+             && st.st_ino == ds->ino
+             && timespec_cmp (get_stat_ctime (&st), ds->ctime) == 0)
+           {
+             /* Unlink the placeholder, then create a hard link if possible,
+                a symbolic link otherwise.  */
+             if (unlink (source) != 0)
+               unlink_error (source);
+             else if (valid_source && link (valid_source, source) == 0)
+               ;
+             else if (!ds->is_symlink)
+               {
+                 if (link (ds->target, source) != 0)
+                   link_error (ds->target, source);
+               }
+             else if (symlink (ds->target, source) != 0)
+               symlink_error (ds->target, source);
+             else
+               {
+                 struct tar_stat_info st1;
+                 st1.stat.st_mode = ds->mode;
+                 st1.stat.st_uid = ds->uid;
+                 st1.stat.st_gid = ds->gid;
+                 st1.atime = ds->atime;
+                 st1.mtime = ds->mtime;
+                 set_stat (source, &st1, -1, 0, 0, SYMTYPE,
+                           false, AT_SYMLINK_NOFOLLOW);
+                 valid_source = source;
+               }
+           }
+       }
+
+      for (sources = ds->sources; sources; )
+       {
+         struct string_list *next = sources->next;
+         free (sources);
+         sources = next;
+       }
+
+      {
+       struct delayed_link *next = ds->next;
+       free (ds);
+       ds = next;
+      }
+    }
+
+  delayed_link_head = 0;
+}

 
 

+/* Finish the extraction of an archive.  */

 void
 void

-apply_delayed_set_stat (void)
+extract_finish (void)

 {
 {

-  struct delayed_set_stat *data;
+  /* First, fix the status of ordinary directories that need fixing.  */
+  apply_nonancestor_delayed_set_stat ("", 0);

 
 

-  while (delayed_set_stat_head)
+  /* Then, apply delayed links, so that they don't affect delayed
+     directory status-setting for ordinary directories.  */
+  apply_delayed_links ();
+
+  /* Finally, fix the status of directories that are ancestors
+     of delayed links.  */
+  apply_nonancestor_delayed_set_stat ("", 1);
+}
+
+bool
+rename_directory (char *src, char *dst)
+{
+  if (rename (src, dst))

     {
     {

-      data = delayed_set_stat_head;
-      delayed_set_stat_head = delayed_set_stat_head->next;
-      set_stat (data->file_name, &data->stat_info, 0);
-      free (data->file_name);
-      free (data);
+      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;

 }
 }