Fix Solaris bug where chmod fails if we don't have PRIV_SYS_LINKDIR

[chaz/tar] / src / extract.c

diff --git a/src/extract.c b/src/extract.c
index ee3720df3182a8776066f77de3b909a8a2e93d98..40d55282ff4275d4c44586bcad5ec8fce2864b49 100644 (file)
--- a/src/extract.c
+++ b/src/extract.c
@@ -1,13 +1,13 @@
 /* Extract files from a tar archive.
 
 /* Extract files from a tar archive.
 

-   Copyright 1988, 1992, 1993, 1994, 1996, 1997, 1998, 1999, 2000,
-   2001 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1998, 1999, 2000,
+   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


@@ -17,24 +17,18 @@
 
    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"
+#include <system.h>

 #include <quotearg.h>
 #include <quotearg.h>

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

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

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


@@ -44,7 +38,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


@@ -53,37 +48,52 @@ enum permstatus
 };
 
 /* List of directories whose statuses we need to extract after we've
 };
 
 /* List of directories whose statuses we need to extract after we've

-   finished extracting their subsidiary files.  The head of the list
-   has the longest name; each non-head element in the list is an
-   ancestor (in the directory hierarchy) of the preceding element.  */
+   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;
 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;

+    bool after_links;

     char file_name[1];
   };
 
 static struct delayed_set_stat *delayed_set_stat_head;
 
     char file_name[1];
   };
 
 static struct delayed_set_stat *delayed_set_stat_head;
 

-/* List of symbolic links whose creation we have delayed.  */
-struct delayed_symlink
+/* List of links whose creation we have delayed.  */
+struct delayed_link

   {
   {

-    /* The next delayed symbolic link in the list.  */
-    struct delayed_symlink *next;
+    /* The next delayed link in the list.  */
+    struct delayed_link *next;

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

 
 

-    /* The desired owner and group of the symbolic link.  */
+    /* True if the link is symbolic.  */
+    bool is_symlink;
+
+    /* The desired owner and group of the link, if it is a symlink.  */

     uid_t uid;
     gid_t gid;
 
     uid_t uid;
     gid_t gid;
 

-    /* A list of sources for this symlink.  The sources are all to be
+    /* A list of sources for this link.  The sources are all to be

        hard-linked together.  */
     struct string_list *sources;
 
        hard-linked together.  */
     struct string_list *sources;
 


@@ -91,7 +101,7 @@ struct delayed_symlink
     char target[1];
   };
 
     char target[1];
   };
 

-static struct delayed_symlink *delayed_symlink_head;
+static struct delayed_link *delayed_link_head;

 
 struct string_list
   {
 
 struct string_list
   {


@@ -106,7 +116,6 @@ extr_init (void)
   we_are_root = geteuid () == 0;
   same_permissions_option += we_are_root;
   same_owner_option += we_are_root;
   we_are_root = geteuid () == 0;
   same_permissions_option += we_are_root;
   same_owner_option += we_are_root;

-  xalloc_fail_func = extract_finish;

 
   /* Option -p clears the kernel umask, so it does not affect proper
      restoration of file permissions.  New intermediate directories will
 
   /* Option -p clears the kernel umask, so it does not affect proper
      restoration of file permissions.  New intermediate directories will


@@ -123,28 +132,35 @@ extr_init (void)
 }
 
 /* If restoring permissions, restore the mode for FILE_NAME from
 }
 
 /* If restoring permissions, restore the mode for FILE_NAME from

-   information given in *STAT_INFO; otherwise invert the
+   information given in *STAT_INFO (where *CUR_INFO gives
+   the current status if CUR_INFO is nonzero); otherwise invert the

    INVERT_PERMISSIONS bits from the file's current permissions.
    PERMSTATUS specifies the status of the file's permissions.
    TYPEFLAG specifies the type of the file.  */
 static void
    INVERT_PERMISSIONS bits from the file's current permissions.
    PERMSTATUS specifies the status of the file's permissions.
    TYPEFLAG specifies the type of the file.  */
 static void

-set_mode (char const *file_name, struct stat const *stat_info,
+set_mode (char const *file_name,
+         struct stat const *stat_info,
+         struct stat const *cur_info,

          mode_t invert_permissions, enum permstatus permstatus,
          char typeflag)
 {
   mode_t mode;
          mode_t invert_permissions, enum permstatus permstatus,
          char typeflag)
 {
   mode_t mode;

-
+  bool failed;
+  

   if (0 < same_permissions_option
       && permstatus != INTERDIR_PERMSTATUS)
     {
       mode = stat_info->st_mode;
 
   if (0 < same_permissions_option
       && permstatus != INTERDIR_PERMSTATUS)
     {
       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;


@@ -160,30 +176,64 @@ set_mode (char const *file_name, struct stat const *stat_info,
         that we created, so there's no point optimizing this code for
         other cases.  */
       struct stat st;
         that we created, so there's no point optimizing this code for
         other cases.  */
       struct stat st;

-      if (stat (file_name, &st) != 0)
+      if (! cur_info)

        {
        {

-         stat_error (file_name);
-         return;
+         if (stat (file_name, &st) != 0)
+           {
+             stat_error (file_name);
+             return;
+           }
+         cur_info = &st;

        }
        }

-      mode = st.st_mode ^ invert_permissions;
+      mode = cur_info->st_mode ^ invert_permissions;

     }
 
     }
 

-  if (chmod (file_name, mode) != 0)
+  failed = chmod (file_name, mode) != 0;
+  if (failed && errno == EPERM)
+    {
+      /* On Solaris, chmod may fail if we don't have PRIV_ALL.  */
+      if (priv_set_restore_linkdir () == 0)
+       {
+         failed = chmod (file_name, mode) != 0;
+         priv_set_remove_linkdir ();
+       }
+    }
+  if (failed)

     chmod_error_details (file_name, mode);
 }
 
 /* Check time after successfully setting FILE_NAME's time stamp to T.  */
 static void
     chmod_error_details (file_name, mode);
 }
 
 /* Check time after successfully setting FILE_NAME's time stamp to T.  */
 static void

-check_time (char const *file_name, time_t t)
+check_time (char const *file_name, struct timespec t)

 {
 {

-  time_t now;
-  if (start_time < t && (now = time (0)) < t)
-    WARN ((0, 0, _("%s: time stamp %s is %lu s in the future"),
-          file_name, tartime (t), (unsigned long) (t - now)));
+  if (t.tv_sec <= 0)
+    WARN ((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--;
+           }
+         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
+   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.


@@ -195,12 +245,12 @@ check_time (char const *file_name, time_t t)
    punt for the rest.  Sigh!  */
 
 static void
    punt for the rest.  Sigh!  */
 
 static void

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

          mode_t invert_permissions, enum permstatus permstatus,
          char typeflag)
 {
          mode_t invert_permissions, enum permstatus permstatus,
          char typeflag)
 {

-  struct utimbuf utimbuf;
-

   if (typeflag != SYMTYPE)
     {
       /* We do the utime before the chmod because some versions of utime are
   if (typeflag != SYMTYPE)
     {
       /* We do the utime before the chmod because some versions of utime are


@@ -214,28 +264,28 @@ set_stat (char const *file_name, struct stat const *stat_info,
 
          /* FIXME: incremental_option should set ctime too, but how?  */
 
 
          /* FIXME: incremental_option should set ctime too, but how?  */
 

+         struct timespec ts[2];

          if (incremental_option)
          if (incremental_option)

-           utimbuf.actime = stat_info->st_atime;
+           ts[0] = st->atime;

          else
          else

-           utimbuf.actime = start_time;
+           ts[0] = start_time;
+         ts[1] = st->mtime;

 
 

-         utimbuf.modtime = stat_info->st_mtime;
-
-         if (utime (file_name, &utimbuf) < 0)
+         if (utimens (file_name, ts) != 0)

            utime_error (file_name);
          else
            {
            utime_error (file_name);
          else
            {

-             check_time (file_name, stat_info->st_atime);
-             check_time (file_name, stat_info->st_mtime);
+             check_time (file_name, ts[0]);
+             check_time (file_name, ts[1]);

            }
        }
 
       /* 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,
-               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)


@@ -244,60 +294,86 @@ set_stat (char const *file_name, struct stat const *stat_info,
         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,
-                     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->invert_permissions = invert_permissions;
   data->permstatus = permstatus;

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

   delayed_set_stat_head = data;
 }
 
 /* Update the delayed_set_stat info for an intermediate directory
   delayed_set_stat_head = data;
 }
 
 /* Update the delayed_set_stat info for an intermediate directory

-   created on the path to DIR_NAME.  The intermediate directory turned
+   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
    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_name,
+repair_delayed_set_stat (char const *dir,

                         struct stat const *dir_stat_info)
 {
   struct delayed_set_stat *data;
                         struct stat const *dir_stat_info)
 {
   struct delayed_set_stat *data;


@@ -313,33 +389,39 @@ repair_delayed_set_stat (char const *dir_name,
       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;
-         data->invert_permissions = (MODE_RWX
-                                     & (current_stat.st_mode ^ st.st_mode));
+         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 =
+           ((current_stat_info.stat.st_mode ^ st.st_mode)
+            & MODE_RWX & ~ current_umask);

          data->permstatus = ARCHIVED_PERMSTATUS;
          return;
        }
     }
 
   ERROR ((0, 0, _("%s: Unexpected inconsistency when making directory"),
          data->permstatus = ARCHIVED_PERMSTATUS;
          return;
        }
     }
 
   ERROR ((0, 0, _("%s: Unexpected inconsistency when making directory"),

-         quotearg_colon (dir_name)));
+         quotearg_colon (dir)));

 }
 
 }
 

-/* After a file/link/symlink/directory creation has failed, see if
+/* 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)
 {
    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)
 {

-  char *cursor0 = file_name + FILESYSTEM_PREFIX_LEN (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 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))


@@ -350,7 +432,7 @@ make_directories (char *file_name)
       if (cursor == cursor0 || ISSLASH (cursor[-1]))
        continue;
 
       if (cursor == cursor0 || ISSLASH (cursor[-1]))
        continue;
 

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

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


@@ -358,7 +440,7 @@ make_directories (char *file_name)
                  && (cursor == cursor0 + 2 || ISSLASH (cursor[-3])))))
        continue;
 
                  && (cursor == cursor0 + 2 || ISSLASH (cursor[-3])))))
        continue;
 

-      *cursor = '\0';          /* truncate the path there */
+      *cursor = '\0';          /* truncate the name there */

       mode = MODE_RWX & ~ newdir_umask;
       invert_permissions = we_are_root ? 0 : MODE_WXUSR & ~ mode;
       status = mkdir (file_name, mode ^ invert_permissions);
       mode = MODE_RWX & ~ newdir_umask;
       invert_permissions = we_are_root ? 0 : MODE_WXUSR & ~ mode;
       status = mkdir (file_name, mode ^ invert_permissions);


@@ -369,7 +451,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 /* 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);


@@ -381,13 +463,13 @@ 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.  */
        continue;
 
       /* Some other error in the mkdir.  We return to the caller.  */


@@ -397,35 +479,43 @@ make_directories (char *file_name)
   return did_something;                /* tell them to retry if we made one */
 }
 
   return did_something;                /* tell them to retry if we made one */
 }
 

-/* Prepare to extract a file.
-   Return zero if extraction should not proceed.  */
-
-static int
-prepare_to_extract (char const *file_name)
+static bool
+file_newer_p (const char *file_name, struct tar_stat_info *tar_stat)

 {
 {

-  if (to_stdout_option)
-    return 0;
+  struct stat st;

 
 

-  if (old_files_option == UNLINK_FIRST_OLD_FILES
-      && !remove_any_file (file_name, recursive_unlink_option)
-      && errno && errno != ENOENT)
+  if (stat (file_name, &st))

     {
     {

-      unlink_error (file_name);
-      return 0;
+      stat_warn (file_name);
+      /* Be on the safe side: if the file does exist assume it is newer */
+      return errno != ENOENT;

     }
     }

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

 }
 
 }
 

+#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.
 /* 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.  */
+   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
 maybe_recoverable (char *file_name, int *interdir_made)
 {
 static int
 maybe_recoverable (char *file_name, int *interdir_made)
 {

+  int e = errno;
+

   if (*interdir_made)
   if (*interdir_made)

-    return 0;
+    return RECOVER_NO;

 
   switch (errno)
     {
 
   switch (errno)
     {


@@ -434,16 +524,28 @@ maybe_recoverable (char *file_name, int *interdir_made)
 
       switch (old_files_option)
        {
 
       switch (old_files_option)
        {

-       default:
-         return 0;
+       case KEEP_OLD_FILES:
+         return RECOVER_SKIP;
+
+       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 DEFAULT_OLD_FILES:

+       case NO_OVERWRITE_DIR_OLD_FILES:

        case OVERWRITE_OLD_FILES:
          {
        case OVERWRITE_OLD_FILES:
          {

-           int r = remove_any_file (file_name, 0);
+           int r = remove_any_file (file_name, ORDINARY_REMOVE_OPTION);

            errno = EEXIST;
            errno = EEXIST;

-           return r;
+           return r > 0 ? RECOVER_OK : RECOVER_NO;

          }
          }

+
+       case UNLINK_FIRST_OLD_FILES:
+         break;

        }
 
     case ENOENT:
        }
 
     case ENOENT:


@@ -451,715 +553,741 @@ maybe_recoverable (char *file_name, int *interdir_made)
       if (! make_directories (file_name))
        {
          errno = ENOENT;
       if (! make_directories (file_name))
        {
          errno = ENOENT;

-         return 0;
+         return RECOVER_NO;

        }
       *interdir_made = 1;
        }
       *interdir_made = 1;

-      return 1;
+      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;
-
-  /* assuming sizeleft is initially totalsize */
+  size_t file_name_len = strlen (file_name);
+  bool check_for_renamed_directories = 0;

 
 

-  while (*sizeleft > 0)
+  while (delayed_set_stat_head)

     {
     {

-      size_t written;
-      size_t count;
-      union block *data_block = find_next_block ();
-      if (! data_block)
-       {
-         ERROR ((0, 0, _("Unexpected EOF in archive")));
-         return;
-       }
-      if (lseek (fd, sparsearray[sparse_ind].offset, SEEK_SET) < 0)
-       {
-         seek_error_details (name, sparsearray[sparse_ind].offset);
-         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;
+      struct stat const *cur_info = 0;
+
+      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;
+
+      if (check_for_renamed_directories)

        {
        {

-         count = full_write (fd, data_block->buffer, BLOCKSIZE);
-         written -= count;
-         *sizeleft -= count;
-         if (count != BLOCKSIZE)
+         cur_info = &st;
+         if (stat (data->file_name, &st) != 0)

            {
            {

-             write_error_details (name, count, BLOCKSIZE);
-             return;
+             stat_error (data->file_name);
+             skip_this_one = 1;

            }
            }

-         set_next_block_after (data_block);
-         data_block = find_next_block ();
-         if (! data_block)
+         else if (! (st.st_dev == data->dev && st.st_ino == data->ino))

            {
            {

-             ERROR ((0, 0, _("Unexpected EOF in archive")));
-             return;
+             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);
-      *sizeleft -= count;
-
-      if (count != written)
+      if (! skip_this_one)

        {
        {

-         write_error_details (name, count, written);
-         return;
+         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);

        }
 
        }
 

-      set_next_block_after (data_block);
-    }
-}
-
-/* Fix the statuses of all directories whose statuses need fixing, and
-   which are not ancestors of FILE_NAME.  */
-static void
-apply_nonancestor_delayed_set_stat (char const *file_name)
-{
-  size_t file_name_len = strlen (file_name);
-
-  while (delayed_set_stat_head)
-    {
-      struct delayed_set_stat *data = delayed_set_stat_head;
-      if (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;

       delayed_set_stat_head = data->next;
       delayed_set_stat_head = data->next;

-      set_stat (data->file_name, &data->stat_info,
-               data->invert_permissions, data->permstatus, DIRTYPE);

       free (data);
     }
 }
 
       free (data);
     }
 }
 

-/* Extract a file from the archive.  */
-void
-extract_archive (void)
+\f
+
+/* 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;

-  size_t count;
-  size_t name_length;
-  size_t written;
-  int openflag;

   mode_t mode;
   mode_t mode;

-  off_t size;
-  size_t skipcrud;
-  int counter;

   int interdir_made = 0;
   int interdir_made = 0;

-  char typeflag;
-  union block *exhdr;
-
-#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))
+  /* Save 'root device' to avoid purging mount points. */
+  if (one_file_system_option && root_device == 0)

     {
     {

-      skip_member ();
-      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;
-  if (! absolute_names_option)
-    {
-      if (contains_dot_dot (CURRENT_FILE_NAME))
-       {
-         ERROR ((0, 0, _("%s: Member name contains `..'"),
-                 quotearg_colon (CURRENT_FILE_NAME)));
-         skip_member ();
-         return;
-       }
-
-      skipcrud = FILESYSTEM_PREFIX_LEN (current_file_name);
-      while (ISSLASH (CURRENT_FILE_NAME[0]))
-       skipcrud++;
+      struct stat st;
+      char *dir = xgetcwd ();

 
 

-      if (skipcrud)
-       {
-         static int warned_once;
-         
-         if (!warned_once)
-           {
-             warned_once = 1;
-             WARN ((0, 0, _("Removing leading `%.*s' from member names"),
-                    (int) skipcrud, current_file_name));
-           }
-       }
+      if (deref_stat (true, dir, &st))
+       stat_diag (dir);
+      else
+       root_device = st.st_dev;
+      free (dir);

     }
 
     }
 

-  apply_nonancestor_delayed_set_stat (CURRENT_FILE_NAME);
+  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 ();

 
 

-  /* Take a safety backup of a previously existing file.  */
+  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;

 
 

-  if (backup_option && !to_stdout_option)
-    if (!maybe_backup_file (CURRENT_FILE_NAME, 0))
-      {
-       int e = errno;
-       ERROR ((0, e, _("%s: Was unable to backup this file"),
-               quotearg_colon (CURRENT_FILE_NAME)));
-       skip_member ();
-       return;
-      }
-
-  /* Extract the archive entry according to its type.  */
-
-  typeflag = current_header->header.typeflag;
-  switch (typeflag)
+  while ((status = mkdir (file_name, mode)))

     {
     {

-      /* 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++)
-       {
-         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;
-       }
-
-      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 in archive")));
-                 return;
-               }
-             for (counter = 0; counter < SPARSES_IN_SPARSE_HEADER; counter++)
+             if (interdir_made)

                {
                {

-                 struct sparse const *s = &exhdr->sparse_header.sp[counter];
-                 if (counter + ind > sp_array_size - 1)
-                   {
-                     /* 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));
-                   }
-                 if (s->numbytes[0] == 0)
-                   break;
-                 sparsearray[counter + ind].offset =
-                   OFF_FROM_HEADER (s->offset);
-                 sparsearray[counter + ind].numbytes =
-                   SIZE_FROM_HEADER (s->numbytes);
+                 repair_delayed_set_stat (file_name, &st);
+                 return 0;

                }
                }

-             if (!exhdr->sparse_header.isextended)
-               break;
-             else
+             if (S_ISDIR (st.st_mode))

                {
                {

-                 ind += SPARSES_IN_SPARSE_HEADER;
-                 set_next_block_after (exhdr);
+                 mode = st.st_mode;
+                 break;

                }
            }
                }
            }

-         set_next_block_after (exhdr);
+         errno = EEXIST;

        }
        }

-      /* Fall through.  */

 
 

-    case AREGTYPE:
-    case REGTYPE:
-    case CONTTYPE:
+      switch (maybe_recoverable (file_name, &interdir_made))
+       {
+       case RECOVER_OK:
+         continue;

 
 

-      /* Appears to be a file.  But BSD tar uses the convention that a slash
-        suffix means a directory.  */
+       case RECOVER_SKIP:
+         break;

 
 

-      name_length = strlen (CURRENT_FILE_NAME);
-      if (FILESYSTEM_PREFIX_LEN (CURRENT_FILE_NAME) < name_length
-         && CURRENT_FILE_NAME[name_length - 1] == '/')
-       goto really_dir;
+       case RECOVER_NO:
+         if (errno != EEXIST)
+           {
+             mkdir_error (file_name);
+             return 1;
+           }
+         break;
+       }
+      break;
+    }
+
+  if (status == 0
+      || old_files_option == DEFAULT_OLD_FILES
+      || old_files_option == OVERWRITE_OLD_FILES)
+    {
+      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;
+}

 
 

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

 
 

-    again_file:
-      openflag = (O_WRONLY | O_BINARY | O_CREAT
+static int
+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));
                  | (old_files_option == OVERWRITE_OLD_FILES
                     ? O_TRUNC
                     : O_EXCL));

-      mode = current_stat.st_mode & MODE_RWX & ~ current_umask;
-
-      if (to_stdout_option)
-       {
-         fd = STDOUT_FILENO;
-         goto extract_file;
-       }
-
-      if (! prepare_to_extract (CURRENT_FILE_NAME))
-       {
-         skip_member ();
-         if (backup_option)
-           undo_last_backup ();
-         break;
-       }

 
 #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,
-                  mode, current_stat.st_size);
-      else
-       fd = open (CURRENT_FILE_NAME, openflag, 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;
+         WARN ((0, 0, _("Extracting contiguous files as regular files")));

        }
        }

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

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

+  return fd;
+}
+
+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;
+  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.  */
+
+  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)
        {
       if (fd < 0)
        {

-         if (maybe_recoverable (CURRENT_FILE_NAME, &interdir_made))
-           goto again_file;
-
-         open_error (CURRENT_FILE_NAME);

          skip_member ();
          skip_member ();

-         if (backup_option)
-           undo_last_backup ();
-         break;
+         return 0;

        }
        }

+    }
+  else
+    {
+      int recover = RECOVER_NO;
+      do
+       fd = open_output_file (file_name, typeflag, mode ^ invert_permissions);
+      while (fd < 0
+            && (recover = maybe_recoverable (file_name, &interdir_made))
+                == RECOVER_OK);

 
 

-    extract_file:
-      if (typeflag == GNUTYPE_SPARSE)
+      if (fd < 0)

        {
        {

-         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);
-         free (sparsearray);
+         skip_member ();
+         if (recover == RECOVER_SKIP)
+           return 0;
+         open_error (file_name);
+         return 1;

        }
        }

-      else
-       for (size = current_stat.st_size; size > 0; )
+    }
+
+  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; )
+      {
+       mv_size_left (size);
+
+       /* Locate data, determine max length writeable, write it,
+          block that we have used the data, then check if the write
+          worked.  */
+
+       data_block = find_next_block ();
+       if (! data_block)

          {
          {

-           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 in archive")));
-               break;          /* FIXME: What happens, then?  */
-             }
-
-           written = available_space_after (data_block);
-
-           if (written > size)
-             written = size;
-           errno = 0;
-           count = full_write (fd, data_block->buffer, written);
-           size -= count;
-
-           set_next_block_after ((union block *)
-                                 (data_block->buffer + written - 1));
-           if (count != written)
-             {
-               write_error_details (CURRENT_FILE_NAME, count, written);
-               break;
-             }
+           ERROR ((0, 0, _("Unexpected EOF in archive")));
+           break;              /* FIXME: What happens, then?  */

          }
 
          }
 

-      skip_file (size);
+       written = available_space_after (data_block);

 
 

-      if (multi_volume_option)
-       assign_string (&save_name, 0);
+       if (written > size)
+         written = size;
+       errno = 0;
+       count = full_write (fd, data_block->buffer, written);
+       size -= written;

 
 

-      /* 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.  */
+       set_next_block_after ((union block *)
+                             (data_block->buffer + written - 1));
+       if (count != written)
+         {
+           if (!to_command_option)
+             write_error_details (file_name, count, written);
+           /* FIXME: shouldn't we restore from backup? */
+           break;
+         }
+      }

 
 

-      if (to_stdout_option)
-       break;
+  skip_file (size);

 
 

-      status = close (fd);
-      if (status < 0)
-       {
-         close_error (CURRENT_FILE_NAME);
-         if (backup_option)
-           undo_last_backup ();
-       }
+  mv_end ();

 
 

-      set_stat (CURRENT_FILE_NAME, &current_stat, 0,
-               (old_files_option == OVERWRITE_OLD_FILES
-                ? UNKNOWN_PERMSTATUS
-                : ARCHIVED_PERMSTATUS),
-               typeflag);
-      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.  */

 
 

-    case SYMTYPE:
-#ifdef HAVE_SYMLINK
-      if (! prepare_to_extract (CURRENT_FILE_NAME))
-       break;
+  if (to_stdout_option)
+    return 0;

 
 

-      if (absolute_names_option
-         || ! (ISSLASH (current_link_name
-                        [FILESYSTEM_PREFIX_LEN (current_link_name)])
-               || contains_dot_dot (current_link_name)))
-       {
-         while (status = symlink (current_link_name, CURRENT_FILE_NAME),
-                status != 0)
-           if (!maybe_recoverable (CURRENT_FILE_NAME, &interdir_made))
-             break;
+  status = close (fd);
+  if (status < 0)
+    close_error (file_name);

 
 

-         if (status == 0)
-           set_stat (CURRENT_FILE_NAME, &current_stat, 0, 0, SYMTYPE);
-         else
-           symlink_error (current_link_name, CURRENT_FILE_NAME);
-       }
-      else
-       {
-         /* This symbolic link is potentially dangerous.  Don't
-            create it now; instead, create a placeholder file, which
-            will be replaced after other extraction is done.  */
-         struct stat st;
+  if (to_command_option)
+    sys_wait_command ();
+  else
+    set_stat (file_name, &current_stat_info, NULL, invert_permissions,
+             (old_files_option == OVERWRITE_OLD_FILES ?
+              UNKNOWN_PERMSTATUS : ARCHIVED_PERMSTATUS),
+             typeflag);
+
+  return status;
+}

 
 

-         while (fd = open (CURRENT_FILE_NAME, O_WRONLY | O_CREAT | O_EXCL, 0),
-                fd < 0)
-           if (! maybe_recoverable (CURRENT_FILE_NAME, &interdir_made))
-             break;
+/* 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.  */

 
 

-         status = -1;
-         if (fd < 0)
-           open_error (CURRENT_FILE_NAME);
-         else if (fstat (fd, &st) != 0)
-           {
-             stat_error (CURRENT_FILE_NAME);
-             close (fd);
-           }
-         else if (close (fd) != 0)
-           close_error (CURRENT_FILE_NAME);
-         else
+static int
+create_placeholder_file (char *file_name, bool is_symlink, int *interdir_made)
+{
+  int fd;
+  struct stat st;
+
+  while ((fd = open (file_name, O_WRONLY | O_CREAT | O_EXCL, 0)) < 0)
+    if (! maybe_recoverable (file_name, interdir_made))
+      break;
+
+  if (fd < 0)
+    open_error (file_name);
+  else 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->mtime = get_stat_mtime (&st);
+      p->is_symlink = is_symlink;
+      if (is_symlink)
+       {
+         p->uid = current_stat_info.stat.st_uid;
+         p->gid = current_stat_info.stat.st_gid;
+       }
+      p->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))
+       {
+         do

            {
            {

-             struct delayed_symlink *p =
-               xmalloc (offsetof (struct delayed_symlink, target)
-                        + strlen (current_link_name) + 1);
-             p->next = delayed_symlink_head;
-             delayed_symlink_head = p;
-             p->dev = st.st_dev;
-             p->ino = st.st_ino;
-             p->mtime = st.st_mtime;
-             p->uid = current_stat.st_uid;
-             p->gid = current_stat.st_gid;
-             p->sources = xmalloc (offsetof (struct string_list, string)
-                                   + strlen (CURRENT_FILE_NAME) + 1);
-             p->sources->next = 0;
-             strcpy (p->sources->string, CURRENT_FILE_NAME);
-             strcpy (p->target, current_link_name);
-             status = 0;
+             h->after_links = 1;
+
+             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);

        }
        }

-  
-      if (status != 0 && backup_option)
-       undo_last_backup ();
-      break;

 
 

-#else
-      {
-       static int warned_once;
+      return 0;
+    }

 
 

-       if (!warned_once)
-         {
-           warned_once = 1;
-           WARN ((0, 0,
-                  _("Attempting extraction of symbolic links as hard links")));
-         }
-      }
-      typeflag = LNKTYPE;
-      /* Fall through.  */
-#endif
+  return -1;
+}

 
 

-    case LNKTYPE:
-      if (! prepare_to_extract (CURRENT_FILE_NAME))
-       break;
+static int
+extract_link (char *file_name, int typeflag)
+{
+  int interdir_made = 0;
+  char const *link_name;

 
 

-    again_link:
-      {
-       struct stat st1, st2;
-       int e;
+  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);

 
 

-       /* MSDOS does not implement links.  However, djgpp's link() actually
-          copies the file.  */
-       status = link (current_link_name, CURRENT_FILE_NAME);
+  do
+    {
+      struct stat st1, st2;
+      int e;
+      int status = link (link_name, file_name);
+      e = errno;

 
 

-       if (status == 0)
-         {
-           struct delayed_symlink *ds = delayed_symlink_head;
-           if (ds && stat (current_link_name, &st1) == 0)
-             for (; ds; ds = ds->next)
-               if (ds->dev == st1.st_dev
-                   && ds->ino == st1.st_ino
-                   && ds->mtime == st1.st_mtime)
-                 {
-                   struct string_list *p = 
-                     xmalloc (offsetof (struct string_list, string)
-                              + strlen (CURRENT_FILE_NAME) + 1);
-                   strcpy (p->string, CURRENT_FILE_NAME);
-                   p->next = ds->sources;
-                   ds->sources = p;
-                   break;
-                 }
-           break;
-         }
-       if (maybe_recoverable (CURRENT_FILE_NAME, &interdir_made))
-         goto again_link;
+      if (status == 0)
+       {
+         struct delayed_link *ds = delayed_link_head;
+         if (ds && lstat (link_name, &st1) == 0)
+           for (; ds; ds = ds->next)
+             if (ds->dev == st1.st_dev
+                 && ds->ino == st1.st_ino
+                 && timespec_cmp (ds->mtime, get_stat_mtime (&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;
+       }
+      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 (maybe_recoverable (file_name, &interdir_made));

 
 

-       if (incremental_option && errno == EEXIST)
-         break;
-       e = errno;
-       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 (!(incremental_option && errno == EEXIST))
+    {
+      link_error (link_name, file_name);
+      return 1;
+    }
+  return 0;
+}

 
 

-       link_error (current_link_name, CURRENT_FILE_NAME);
-       if (backup_option)
-         undo_last_backup ();
-      }
+static int
+extract_symlink (char *file_name, int typeflag)
+{
+#ifdef HAVE_SYMLINK
+  int status;
+  int interdir_made = 0;
+
+  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 ((status = symlink (current_stat_info.link_name, file_name)))
+    if (!maybe_recoverable (file_name, &interdir_made))

       break;
 
       break;
 

-#if S_IFCHR
-    case CHRTYPE:
-      current_stat.st_mode |= S_IFCHR;
-      goto make_node;
-#endif
+  if (status == 0)
+    set_stat (file_name, &current_stat_info, NULL, 0, 0, SYMTYPE);
+  else
+    symlink_error (current_stat_info.link_name, file_name);
+  return status;

 
 

-#if S_IFBLK
-    case BLKTYPE:
-      current_stat.st_mode |= S_IFBLK;
+#else
+  static int warned_once;
+
+  if (!warned_once)
+    {
+      warned_once = 1;
+      WARN ((0, 0, _("Attempting extraction of symbolic links as hard links")));
+    }
+  return extract_link (file_name, typeflag);

 #endif
 #endif

+}

 
 #if S_IFCHR || S_IFBLK
 
 #if S_IFCHR || S_IFBLK

-    make_node:
-      if (! prepare_to_extract (CURRENT_FILE_NAME))
-       break;
+static int
+extract_node (char *file_name, int typeflag)
+{
+  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;

 
 

-      status = mknod (CURRENT_FILE_NAME, current_stat.st_mode,
-                     current_stat.st_rdev);
-      if (status != 0)
-       {
-         if (maybe_recoverable (CURRENT_FILE_NAME, &interdir_made))
-           goto make_node;
-         mknod_error (CURRENT_FILE_NAME);
-         if (backup_option)
-           undo_last_backup ();
-         break;
-       };
-      set_stat (CURRENT_FILE_NAME, &current_stat, 0,
-               ARCHIVED_PERMSTATUS, typeflag);
-      break;
+  do
+    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
+    set_stat (file_name, &current_stat_info, NULL, invert_permissions,
+             ARCHIVED_PERMSTATUS, typeflag);
+  return status;
+}

 #endif
 
 #if HAVE_MKFIFO || defined mkfifo
 #endif
 
 #if HAVE_MKFIFO || defined mkfifo

-    case FIFOTYPE:
-      if (! prepare_to_extract (CURRENT_FILE_NAME))
-       break;
-
-      while (status = mkfifo (CURRENT_FILE_NAME, current_stat.st_mode),
-            status != 0)
-       if (!maybe_recoverable (CURRENT_FILE_NAME, &interdir_made))
-         break;
+static int
+extract_fifo (char *file_name, int typeflag)
+{
+  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;

 
 

-      if (status == 0)
-       set_stat (CURRENT_FILE_NAME, &current_stat, 0,
-                 ARCHIVED_PERMSTATUS, typeflag);
-      else
-       {
-         mkfifo_error (CURRENT_FILE_NAME);
-         if (backup_option)
-           undo_last_backup ();
-       }
+  while ((status = mkfifo (file_name, mode)) != 0)
+    if (!maybe_recoverable (file_name, &interdir_made))

       break;
       break;

+
+  if (status == 0)
+    set_stat (file_name, &current_stat_info, NULL, invert_permissions,
+             ARCHIVED_PERMSTATUS, typeflag);
+  else
+    mkfifo_error (file_name);
+  return status;
+}

 #endif
 
 #endif
 

-    case DIRTYPE:
-    case GNUTYPE_DUMPDIR:
-      name_length = strlen (CURRENT_FILE_NAME);
+static int
+extract_volhdr (char *file_name, int typeflag)
+{
+  if (verbose_option)
+    fprintf (stdlis, _("Reading %s\n"), quote (current_stat_info.file_name));
+  skip_member ();
+  return 0;
+}

 
 

-    really_dir:
-      /* Remove any redundant trailing "/"s.  */
-      while (FILESYSTEM_PREFIX_LEN (CURRENT_FILE_NAME) < name_length
-            && CURRENT_FILE_NAME[name_length - 1] == '/')
-       name_length--;
-      CURRENT_FILE_NAME[name_length] = '\0';
+static int
+extract_failure (char *file_name, int typeflag)
+{
+  return 1;
+}

 
 

-      if (incremental_option)
-       {
-         /* Read the entry and delete files that aren't listed in the
-            archive.  */
+typedef int (*tar_extractor_t) (char *file_name, int typeflag);

 
 

-         gnu_restore (skipcrud);
-       }
-      else if (typeflag == GNUTYPE_DUMPDIR)
-       skip_member ();
+\f

 
 

-      if (! prepare_to_extract (CURRENT_FILE_NAME))
-       break;
+/* Prepare to extract a file. Find extractor function.
+   Return zero if extraction should not proceed.  */

 
 

-      mode = ((current_stat.st_mode
-              | (we_are_root ? 0 : MODE_WXUSR))
-             & MODE_RWX);
+static int
+prepare_to_extract (char const *file_name, int typeflag, tar_extractor_t *fun)
+{
+  int rc = 1;

 
 

-    again_dir:
-      status = mkdir (CURRENT_FILE_NAME, mode);
+  if (EXTRACT_OVER_PIPE)
+    rc = 0;

 
 

-      if (status != 0)
-       {
-         if (errno == EEXIST
-             && (interdir_made || old_files_option == OVERWRITE_OLD_FILES))
-           {
-             struct stat st;
-             if (stat (CURRENT_FILE_NAME, &st) == 0)
-               {
-                 if (interdir_made)
-                   {
-                     repair_delayed_set_stat (CURRENT_FILE_NAME, &st);
-                     break;
-                   }
-                 if (S_ISDIR (st.st_mode))
-                   {
-                     mode = st.st_mode & ~ current_umask;
-                     goto directory_exists;
-                   }
-               }
-             errno = EEXIST;
-           }
-       
-         if (maybe_recoverable (CURRENT_FILE_NAME, &interdir_made))
-           goto again_dir;
+  /* Select the extractor */
+  switch (typeflag)
+    {
+    case GNUTYPE_SPARSE:
+      *fun = extract_file;
+      rc = 1;
+      break;

 
 

-         if (errno != EEXIST)
-           {
-             mkdir_error (CURRENT_FILE_NAME);
-             if (backup_option)
-               undo_last_backup ();
-             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
+       {
+         *fun = extract_file;
+         rc = 1;

        }
        }

+      break;
+
+    case SYMTYPE:
+      *fun = extract_symlink;
+      break;

 
 

-    directory_exists:
-      if (status == 0
-         || old_files_option == OVERWRITE_OLD_FILES)
-       delay_set_stat (CURRENT_FILE_NAME, &current_stat,
-                       MODE_RWX & (mode ^ current_stat.st_mode),
-                       (status == 0
-                        ? ARCHIVED_PERMSTATUS
-                        : UNKNOWN_PERMSTATUS));
+    case LNKTYPE:
+      *fun = extract_link;

       break;
 
       break;
 

-    case GNUTYPE_VOLHDR:
-      if (verbose_option)
-       fprintf (stdlis, _("Reading %s\n"), quote (current_file_name));
+#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;
 
       break;
 

-    case GNUTYPE_NAMES:
-      extract_mangle ();
+    case GNUTYPE_VOLHDR:
+      *fun = extract_volhdr;

       break;
 
     case GNUTYPE_MULTIVOL:
       ERROR ((0, 0,
              _("%s: Cannot extract -- file is continued from another volume"),
       break;
 
     case GNUTYPE_MULTIVOL:
       ERROR ((0, 0,
              _("%s: Cannot extract -- file is continued from another volume"),

-             quotearg_colon (current_file_name)));
-      skip_member ();
-      if (backup_option)
-       undo_last_backup ();
+             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_member ();
-      if (backup_option)
-       undo_last_backup ();
+      ERROR ((0, 0, _("Unexpected long name header")));
+      *fun = extract_failure;

       break;
 
     default:
       WARN ((0, 0,
       break;
 
     default:
       WARN ((0, 0,

-            _("%s: Unknown file type '%c', extracted as normal file"),
-            quotearg_colon (CURRENT_FILE_NAME), typeflag));
-      goto again_file;
+            _("%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))
+       {
+         WARN ((0, 0, _("Current %s is newer or same age"),
+                quote (file_name)));
+         return 0;
+       }
+      break;
+
+    default:
+      break;
+    }
+
+  return 1;
+}
+
+/* Extract a file from the archive.  */
+void
+extract_archive (void)
+{
+  char typeflag;
+  tar_extractor_t fun;
+
+  /* Try to disable the ability to unlink a directory.  */
+  priv_set_remove_linkdir ();
+
+  set_next_block_after (current_header);
+  decode_header (current_header, &current_stat_info, &current_format, 1);
+  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, -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)
+    apply_nonancestor_delayed_set_stat (current_stat_info.file_name, 0);
+
+  /* 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 symbolic links whose final extraction were delayed.  */
 static void
 }
 
 /* Extract the symbolic links whose final extraction were delayed.  */
 static void

-apply_delayed_symlinks (void)
+apply_delayed_links (void)

 {
 {

-  struct delayed_symlink *ds;
+  struct delayed_link *ds;

 
 

-  for (ds = delayed_symlink_head; ds; )
+  for (ds = delayed_link_head; ds; )

     {
       struct string_list *sources = ds->sources;
       char const *valid_source = 0;
     {
       struct string_list *sources = ds->sources;
       char const *valid_source = 0;


@@ -1170,12 +1298,12 @@ apply_delayed_symlinks (void)
          struct stat st;
 
          /* Make sure the placeholder file is still there.  If not,
          struct stat st;
 
          /* Make sure the placeholder file is still there.  If not,

-            don't create a symlink, as the placeholder was probably
+            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
             removed by a later extraction.  */
          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.  */


@@ -1183,14 +1311,20 @@ apply_delayed_symlinks (void)
                unlink_error (source);
              else if (valid_source && link (valid_source, 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
                {
              else if (symlink (ds->target, source) != 0)
                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, SYMTYPE);

                }
            }
        }
                }
            }
        }


@@ -1203,23 +1337,62 @@ apply_delayed_symlinks (void)
        }
 
       {
        }
 
       {

-       struct delayed_symlink *next = ds->next;
+       struct delayed_link *next = ds->next;

        free (ds);
        ds = next;
       }
     }
 
        free (ds);
        ds = next;
       }
     }
 

-  delayed_symlink_head = 0;
+  delayed_link_head = 0;

 }
 
 /* Finish the extraction of an archive.  */
 void
 extract_finish (void)
 {
 }
 
 /* Finish the extraction of an archive.  */
 void
 extract_finish (void)
 {

-  /* Apply delayed symlinks last, so that they don't affect
-     delayed directory status-setting.  */
-  apply_nonancestor_delayed_set_stat ("");
-  apply_delayed_symlinks ();
+  /* First, fix the status of ordinary directories that need fixing.  */
+  apply_nonancestor_delayed_set_stat ("", 0);
+
+  /* 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))
+    {
+      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
 }
 
 void


@@ -1229,3 +1402,10 @@ fatal_exit (void)
   error (TAREXIT_FAILURE, 0, _("Error is not recoverable: exiting now"));
   abort ();
 }
   error (TAREXIT_FAILURE, 0, _("Error is not recoverable: exiting now"));
   abort ();
 }

+
+void
+xalloc_die (void)
+{
+  error (0, 0, "%s", _("memory exhausted"));
+  fatal_exit ();
+}