/* 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 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
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 <time.h>
-#ifndef time
-time_t time ();
-#endif
-
-#if HAVE_UTIME_H
-# include <utime.h>
-#else
-struct utimbuf
- {
- long actime;
- long modtime;
- };
-#endif
+#include <system.h>
+#include <quotearg.h>
+#include <utimens.h>
+#include <errno.h>
+#include <xgetcwd.h>
#include "common.h"
-static time_t now; /* current time */
-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) */
-#if 0
-/* "Scratch" space to store the information about a sparse file before
- writing the info into the header or extended header. */
-struct sp_array *sparsearray;
-
-/* Number of elts storable in the sparsearray. */
-int sp_array_size = 10;
-#endif
+/* Status of the permissions of a file that we are extracting. */
+enum permstatus
+{
+ /* This file may have existed already; its permissions are unknown. */
+ UNKNOWN_PERMSTATUS,
+
+ /* This file was created using the permissions from the archive. */
+ ARCHIVED_PERMSTATUS,
+
+ /* This is an intermediate directory; the archive did not specify
+ its permissions. */
+ INTERDIR_PERMSTATUS
+};
+
+/* 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_SYMLINKS is nonzero and [^D]
+ represents an element where AFTER_SYMLINKS 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;
- char *file_name;
struct stat stat_info;
+ size_t file_name_len;
+ mode_t invert_permissions;
+ enum permstatus permstatus;
+ bool after_symlinks;
+ char file_name[1];
};
static struct delayed_set_stat *delayed_set_stat_head;
-/*--------------------------.
-| Set up to extract files. |
-`--------------------------*/
+/* List of symbolic links whose creation we have delayed. */
+struct delayed_symlink
+ {
+ /* The next delayed symbolic link in the list. */
+ struct delayed_symlink *next;
+
+ /* The device, inode number and last-modified time of the placeholder. */
+ dev_t dev;
+ ino_t ino;
+ time_t mtime;
+
+ /* The desired owner and group of the symbolic link. */
+ uid_t uid;
+ gid_t gid;
+ /* A list of sources for this symlink. 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_symlink *delayed_symlink_head;
+
+struct string_list
+ {
+ struct string_list *next;
+ char string[1];
+ };
+
+/* Set up to extract files. */
void
extr_init (void)
{
- now = time (0);
we_are_root = geteuid () == 0;
+ same_permissions_option += we_are_root;
+ same_owner_option += we_are_root;
+
+ /* Save 'root device' to avoid purging mount points.
+ FIXME: Should the same be done after handling -C option ? */
+ if (one_file_system_option)
+ {
+ struct stat st;
+ char *dir = xgetcwd ();
+
+ if (deref_stat (true, dir, &st))
+ stat_diag (dir);
+ else
+ root_device = st.st_dev;
+ }
/* Option -p clears the kernel umask, so it does not affect proper
restoration of file permissions. New intermediate directories will
comply with umask at start of program. */
newdir_umask = umask (0);
- if (same_permissions_option)
+ if (0 < same_permissions_option)
current_umask = 0;
else
{
umask (newdir_umask); /* restore the kernel umask */
current_umask = newdir_umask;
}
-
- /* 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;
}
-/*------------------------------------------------------------------.
-| Restore mode for FILE_NAME, from information given in STAT_INFO. |
-`------------------------------------------------------------------*/
+/* If restoring permissions, restore the mode for FILE_NAME from
+ 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
+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;
+ 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
+ directories inherit the setgid bits from their parents, so we
+ we must set directories' modes explicitly. */
+ if (permstatus == ARCHIVED_PERMSTATUS
+ && ! (mode & ~ MODE_RWX)
+ && typeflag != DIRTYPE
+ && typeflag != GNUTYPE_DUMPDIR)
+ return;
+ }
+ else if (! invert_permissions)
+ return;
+ else
+ {
+ /* We must inspect a directory's current permissions, since the
+ directory may have inherited its setgid bit from its parent.
+
+ INVERT_PERMISSIONS happens to be nonzero only for directories
+ that we created, so there's no point optimizing this code for
+ other cases. */
+ struct stat st;
+ if (! cur_info)
+ {
+ if (stat (file_name, &st) != 0)
+ {
+ stat_error (file_name);
+ return;
+ }
+ cur_info = &st;
+ }
+ mode = cur_info->st_mode ^ invert_permissions;
+ }
+
+ if (chmod (file_name, mode) != 0)
+ chmod_error_details (file_name, mode);
+}
+
+/* Check time after successfully setting FILE_NAME's time stamp to T. */
static void
-set_mode (char *file_name, struct stat *stat_info)
+check_time (char const *file_name, struct timespec t)
{
- /* 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 ((we_are_root || 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 (t.tv_sec <= 0)
+ WARN ((0, 0, _("%s: implausibly old time stamp %s"),
+ file_name, tartime (t, true)));
+ else if (timespec_lt (start_time, t))
+ {
+ struct timespec now;
+ gettime (&now);
+ if (timespec_lt (now, t))
+ {
+ unsigned long int ds = t.tv_sec - now.tv_sec;
+ int dns = t.tv_nsec - now.tv_nsec;
+ char dnsbuf[sizeof ".FFFFFFFFF"];
+ if (dns < 0)
+ {
+ dns += 1000000000;
+ ds--;
+ }
+ code_ns_fraction (dns, dnsbuf);
+ WARN ((0, 0, _("%s: time stamp %s is %lu%s s in the future"),
+ file_name, tartime (t, true), ds, dnsbuf));
+ }
+ }
}
-/*----------------------------------------------------------------------.
-| 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. |
-`----------------------------------------------------------------------*/
+/* Restore stat attributes (owner, group, mode and times) for
+ FILE_NAME, using information given in *STAT_INFO.
+ If CUR_INFO is nonzero, *CUR_INFO is the
+ file's currernt 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.
+ TYPEFLAG specifies the type of the file. */
/* FIXME: About proper restoration of symbolic link attributes, we still do
not have it right. Pretesters' reports tell us we need further study and
punt for the rest. Sigh! */
static void
-set_stat (char *file_name, struct stat *stat_info, int symlink_flag)
+set_stat (char const *file_name,
+ struct stat const *stat_info,
+ struct stat const *cur_info,
+ mode_t invert_permissions, enum permstatus permstatus,
+ char typeflag)
{
- struct utimbuf utimbuf;
-
- if (!symlink_flag)
+ if (typeflag != SYMTYPE)
{
/* We do the utime before the chmod because some versions of utime are
broken and trash the modes of the file. */
- if (!touch_option)
+ if (! touch_option && permstatus != INTERDIR_PERMSTATUS)
{
/* We set the accessed time to `now', which is really the time we
started extracting files, unless incremental_option is used, in
/* FIXME: incremental_option should set ctime too, but how? */
- if (incremental_option)
- utimbuf.actime = stat_info->st_atime;
- else
- utimbuf.actime = now;
-
- utimbuf.modtime = stat_info->st_mtime;
+ struct timespec ts[2];
+ ts[0] = incremental_option ? get_stat_atime (stat_info) : start_time;
+ ts[1] = get_stat_mtime (stat_info);
- if (utime (file_name, &utimbuf) < 0)
- ERROR ((0, errno,
- _("%s: Could not change access and modification times"),
- file_name));
+ if (utimens (file_name, ts) != 0)
+ utime_error (file_name);
+ else
+ {
+ check_time (file_name, ts[0]);
+ check_time (file_name, ts[1]);
+ }
}
/* 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);
+ set_mode (file_name, stat_info, cur_info,
+ invert_permissions, permstatus, typeflag);
}
- /* 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. */
-
- if (we_are_root || same_owner_option)
+ if (0 < same_owner_option && permstatus != INTERDIR_PERMSTATUS)
{
-#if HAVE_LCHOWN
-
/* 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. */
- if (symlink_flag)
+ if (typeflag == SYMTYPE)
{
+#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));
+ chown_error_details (file_name,
+ stat_info->st_uid, stat_info->st_gid);
+#endif
}
else
{
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));
+ chown_error_details (file_name,
+ stat_info->st_uid, stat_info->st_gid);
+
+ /* On a few systems, and in particular, those allowing to give files
+ away, changing the owner or group destroys the suid or sgid bits.
+ So let's attempt setting these bits once more. */
+ if (stat_info->st_mode & (S_ISUID | S_ISGID | S_ISVTX))
+ set_mode (file_name, stat_info, 0,
+ invert_permissions, permstatus, typeflag);
}
+ }
+}
-#else /* not HAVE_LCHOWN */
-
- if (!symlink_flag)
-
- 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));
-
-#endif/* not HAVE_LCHOWN */
-
- if (!symlink_flag)
+/* Remember to restore stat attributes (owner, group, mode and times)
+ for the directory FILE_NAME, using information given in *STAT_INFO,
+ 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. */
+static void
+delay_set_stat (char const *file_name, struct stat const *stat_info,
+ 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->file_name_len = file_name_len;
+ strcpy (data->file_name, file_name);
+ data->invert_permissions = invert_permissions;
+ data->permstatus = permstatus;
+ data->after_symlinks = 0;
+ data->stat_info = *stat_info;
+ data->next = delayed_set_stat_head;
+ delayed_set_stat_head = data;
+}
- /* 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. */
+/* 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 (stat (data->file_name, &st) != 0)
+ {
+ stat_error (data->file_name);
+ return;
+ }
- if (stat_info->st_mode & (S_ISUID | S_ISGID | S_ISVTX))
- set_mode (file_name, stat_info);
+ if (st.st_dev == dir_stat_info->st_dev
+ && st.st_ino == dir_stat_info->st_ino)
+ {
+ data->stat_info = current_stat_info.stat;
+ data->invert_permissions =
+ (MODE_RWX & (current_stat_info.stat.st_mode ^ st.st_mode));
+ data->permstatus = ARCHIVED_PERMSTATUS;
+ 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/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. */
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 saved_errno = errno; /* remember caller's errno */
+ int mode;
+ int invert_permissions;
int status;
- for (cursor = strchr (file_name, '/');
- cursor != NULL;
- cursor = strchr (cursor + 1, '/'))
+
+ for (cursor = cursor0; *cursor; cursor++)
{
+ if (! ISSLASH (*cursor))
+ continue;
+
/* Avoid mkdir of empty string, if leading or double '/'. */
- if (cursor == file_name || cursor[-1] == '/')
+ if (cursor == cursor0 || ISSLASH (cursor[-1]))
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;
- *cursor = '\0'; /* truncate the path there */
- status = mkdir (file_name, ~newdir_umask & MODE_RWX);
+ *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);
if (status == 0)
{
- print_for_mkdir (file_name, cursor - file_name,
- ~newdir_umask & MODE_RWX);
+ /* Create a struct delayed_set_stat even if
+ invert_permissions is zero, because
+ repair_delayed_set_stat may need to update the struct. */
+ delay_set_stat (file_name,
+ ¤t_stat_info.stat /* ignored */,
+ invert_permissions, INTERDIR_PERMSTATUS);
+
+ print_for_mkdir (file_name, cursor - file_name, mode);
did_something = 1;
*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;
}
- errno = saved_errno; /* FIXME: errno should be read-only */
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;
+ 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)
+ && st.st_mtime >= tar_stat->stat.st_mtime)
+ {
+ 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. |
-`--------------------------------------------------------------------*/
-
+/* 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. */
static int
-maybe_recoverable (char *file_name)
+maybe_recoverable (char *file_name, int *interdir_made)
{
+ int e = errno;
+
+ if (*interdir_made)
+ return 0;
+
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 0;
- return remove_any_file (file_name, 0);
+ case KEEP_NEWER_FILES:
+ if (file_newer_p (file_name, ¤t_stat_info))
+ {
+ errno = e;
+ return 0;
+ }
+ /* 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;
+ }
+
+ case UNLINK_FIRST_OLD_FILES:
+ break;
+ }
case ENOENT:
/* Attempt creating missing intermediate directories. */
-
- return make_directories (file_name);
+ if (! make_directories (file_name))
+ {
+ errno = ENOENT;
+ return 0;
+ }
+ *interdir_made = 1;
+ return 1;
default:
/* Just say we can't do anything about it... */
}
}
-/*---.
-| ? |
-`---*/
-
+/* Fix the statuses of all directories whose statuses need fixing, and
+ which are not ancestors of FILE_NAME. If AFTER_SYMLINKS is
+ nonzero, do this for all such directories; otherwise, stop at the
+ first directory that is marked to be fixed up only after delayed
+ symlinks are applied. */
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_symlinks)
{
- 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 == NULL)
- {
- ERROR ((0, 0, _("Unexpected EOF on archive file")));
- return;
- }
- if (lseek (fd, sparsearray[sparse_ind].offset, SEEK_SET) < 0)
+ 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_symlinks;
+
+ if (after_symlinks < data->after_symlinks
+ || (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)
{
- char buf[UINTMAX_STRSIZE_BOUND];
- ERROR ((0, errno, _("%s: lseek error at byte %s"),
- STRINGIFY_BIGINT (sparsearray[sparse_ind].offset, buf),
- name));
- return;
+ cur_info = &st;
+ if (stat (data->file_name, &st) != 0)
+ {
+ stat_error (data->file_name);
+ skip_this_one = 1;
+ }
+ else if (! (st.st_dev == data->stat_info.st_dev
+ && (st.st_ino == data->stat_info.st_ino)))
+ {
+ ERROR ((0, 0,
+ _("%s: Directory renamed before its status could be extracted"),
+ quotearg_colon (data->file_name)));
+ skip_this_one = 1;
+ }
}
- written = sparsearray[sparse_ind++].numbytes;
- while (written > BLOCKSIZE)
+
+ if (! skip_this_one)
+ set_stat (data->file_name, &data->stat_info, cur_info,
+ data->invert_permissions, data->permstatus, DIRTYPE);
+
+ delayed_set_stat_head = data->next;
+ free (data);
+ }
+}
+
+\f
+
+/* Extractor functions for various member types */
+
+static int
+extract_dir (char *file_name, int typeflag)
+{
+ int status;
+ mode_t mode;
+ int interdir_made = 0;
+
+ if (incremental_option)
+ /* Read the entry and delete files that aren't listed in the archive. */
+ purge_directory (file_name);
+ else if (typeflag == GNUTYPE_DUMPDIR)
+ skip_member ();
+
+ mode = (current_stat_info.stat.st_mode | (we_are_root ? 0 : MODE_WXUSR)) & MODE_RWX;
+
+ while ((status = mkdir (file_name, mode)))
+ {
+ if (errno == EEXIST
+ && (interdir_made
+ || old_files_option == DEFAULT_OLD_FILES
+ || old_files_option == OVERWRITE_OLD_FILES))
{
- 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)
+ struct stat st;
+ if (stat (file_name, &st) == 0)
{
- ERROR ((0, 0, _("Unexpected EOF on archive file")));
- return;
+ if (interdir_made)
+ {
+ repair_delayed_set_stat (file_name, &st);
+ return 0;
+ }
+ if (S_ISDIR (st.st_mode))
+ {
+ mode = st.st_mode & ~ current_umask;
+ break;
+ }
}
+ errno = EEXIST;
}
- count = full_write (fd, data_block->buffer, written);
+ if (maybe_recoverable (file_name, &interdir_made))
+ continue;
- if (count < 0)
- ERROR ((0, errno, _("%s: Could not write to file"), name));
- else if (count != written)
+ if (errno != EEXIST)
{
- 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);
+ mkdir_error (file_name);
+ return 1;
}
-
- written -= count;
- *sizeleft -= count;
- set_next_block_after (data_block);
+ break;
}
- free (sparsearray);
+ if (status == 0
+ || old_files_option == DEFAULT_OLD_FILES
+ || old_files_option == OVERWRITE_OLD_FILES)
+ delay_set_stat (file_name, ¤t_stat_info.stat,
+ MODE_RWX & (mode ^ current_stat_info.stat.st_mode),
+ (status == 0
+ ? ARCHIVED_PERMSTATUS
+ : UNKNOWN_PERMSTATUS));
+
+ return status;
}
-/*----------------------------------.
-| Extract a file from the archive. |
-`----------------------------------*/
-void
-extract_archive (void)
+static int
+open_output_file (char *file_name, int typeflag)
{
- union block *data_block;
int fd;
- 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;
+ int openflag = (O_WRONLY | O_BINARY | O_CREAT
+ | (old_files_option == OVERWRITE_OLD_FILES
+ ? O_TRUNC
+ : O_EXCL));
+ mode_t mode = current_stat_info.stat.st_mode & MODE_RWX & ~ current_umask;
-#define CURRENT_FILE_NAME (skipcrud + current_file_name)
+#if O_CTG
+ /* Contiguous files (on the Masscomp) have to specify the size in
+ the open call that creates them. */
- set_next_block_after (current_header);
- decode_header (current_header, ¤t_stat, ¤t_format, 1);
+ if (typeflag == CONTTYPE)
+ fd = open (file_name, openflag | O_CTG, mode, current_stat_info.stat.st_size);
+ else
+ fd = open (file_name, openflag, mode);
- if (interactive_option && !confirm ("extract", current_file_name))
+#else /* not O_CTG */
+ if (typeflag == CONTTYPE)
{
- if (current_header->oldgnu_header.isextended)
- skip_extended_headers ();
- skip_file (current_stat.st_size);
- return;
+ static int conttype_diagnosed;
+
+ if (!conttype_diagnosed)
+ {
+ conttype_diagnosed = 1;
+ WARN ((0, 0, _("Extracting contiguous files as regular files")));
+ }
}
+ fd = open (file_name, openflag, mode);
- /* Print the block from `current_header' and `current_stat'. */
+#endif /* not O_CTG */
- if (verbose_option)
- print_header ();
+ 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;
- /* Check for fully specified file names and other atrocities. */
+ /* FIXME: deal with protection issues. */
- skipcrud = 0;
- while (!absolute_names_option && CURRENT_FILE_NAME[0] == '/')
+ if (to_stdout_option)
+ fd = STDOUT_FILENO;
+ else if (to_command_option)
{
- static int warned_once;
-
- if (!warned_once)
+ fd = sys_exec_command (file_name, 'f', ¤t_stat_info);
+ if (fd < 0)
{
- warned_once = 1;
- WARN ((0, 0, _("Removing leading `/' from archive names")));
+ skip_member ();
+ return 0;
}
- skipcrud++; /* force relative path */
}
+ else
+ {
+ do
+ fd = open_output_file (file_name, typeflag);
+ while (fd < 0 && maybe_recoverable (file_name, &interdir_made));
- /* Take a safety backup of a previously existing file. */
+ if (fd < 0)
+ {
+ open_error (file_name);
+ return 1;
+ }
+ }
- if (backup_option && !to_stdout_option)
- if (!maybe_backup_file (CURRENT_FILE_NAME, 0))
+ if (current_stat_info.is_sparse)
+ sparse_extract_file (fd, ¤t_stat_info, &size);
+ else
+ for (size = current_stat_info.stat.st_size; size > 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;
- }
+ if (multi_volume_option)
+ {
+ assign_string (&save_name, current_stat_info.orig_file_name);
+ save_totsize = current_stat_info.stat.st_size;
+ save_sizeleft = size;
+ }
- /* Extract the archive entry according to its type. */
+ /* Locate data, determine max length writeable, write it,
+ block that we have used the data, then check if the write
+ worked. */
- typeflag = current_header->header.typeflag;
- switch (typeflag)
- {
- /* 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. */
+ data_block = find_next_block ();
+ if (! data_block)
+ {
+ ERROR ((0, 0, _("Unexpected EOF in archive")));
+ break; /* FIXME: What happens, then? */
+ }
- case GNUTYPE_SPARSE:
- sp_array_size = 10;
- sparsearray = (struct sp_array *)
- xmalloc (sp_array_size * sizeof (struct sp_array));
+ written = available_space_after (data_block);
- for (counter = 0; counter < SPARSES_IN_OLDGNU_HEADER; counter++)
- {
- sparsearray[counter].offset =
- OFF_FROM_CHARS (current_header->oldgnu_header.sp[counter].offset);
- sparsearray[counter].numbytes =
- SIZE_FROM_CHARS (current_header->oldgnu_header.sp[counter].numbytes);
- if (!sparsearray[counter].numbytes)
+ if (written > size)
+ written = size;
+ errno = 0;
+ count = full_write (fd, data_block->buffer, written);
+ size -= written;
+
+ set_next_block_after ((union block *)
+ (data_block->buffer + written - 1));
+ if (count != written)
+ {
+ if (!to_command_option)
+ write_error_details (file_name, count, written);
+ /* FIXME: shouldn't we restore from backup? */
break;
- }
+ }
+ }
- if (current_header->oldgnu_header.isextended)
- {
- /* Read in the list of extended headers and translate them
- into the sparsearray as before. Note that this
- invalidates current_header. */
+ skip_file (size);
- /* static */ int ind = SPARSES_IN_OLDGNU_HEADER;
+ if (multi_volume_option)
+ assign_string (&save_name, 0);
- while (1)
- {
- exhdr = find_next_block ();
- if (! exhdr)
- {
- ERROR ((0, 0, _("Unexpected EOF on archive file")));
- return;
- }
- for (counter = 0; counter < SPARSES_IN_SPARSE_HEADER; counter++)
- {
- if (counter + ind > sp_array_size - 1)
- {
- /* Realloc the scratch area since we've run out of
- room. */
+ /* 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. */
- sp_array_size *= 2;
- sparsearray = (struct sp_array *)
- xrealloc (sparsearray,
- sp_array_size * (sizeof (struct sp_array)));
- }
- if (exhdr->sparse_header.sp[counter].numbytes[0] == 0)
- break;
- sparsearray[counter + ind].offset =
- OFF_FROM_CHARS (exhdr->sparse_header.sp[counter].offset);
- sparsearray[counter + ind].numbytes =
- SIZE_FROM_CHARS (exhdr->sparse_header.sp[counter].numbytes);
- }
- if (!exhdr->sparse_header.isextended)
- break;
- else
- {
- ind += SPARSES_IN_SPARSE_HEADER;
- set_next_block_after (exhdr);
- }
- }
- set_next_block_after (exhdr);
- }
- /* Fall through. */
+ if (to_stdout_option)
+ return 0;
- case AREGTYPE:
- case REGTYPE:
- case CONTTYPE:
+ status = close (fd);
+ if (status < 0)
+ close_error (file_name);
- /* Appears to be a file. But BSD tar uses the convention that a slash
- suffix means a directory. */
-
- name_length = strlen (CURRENT_FILE_NAME) - 1;
- if (CURRENT_FILE_NAME[name_length] == '/')
- goto really_dir;
-
- /* FIXME: deal with protection issues. */
+ if (to_command_option)
+ sys_wait_command ();
+ else
+ set_stat (file_name, ¤t_stat_info.stat, 0, 0,
+ (old_files_option == OVERWRITE_OLD_FILES ?
+ UNKNOWN_PERMSTATUS : ARCHIVED_PERMSTATUS),
+ typeflag);
- 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);
+ 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) */
+static int
+extract_link (char *file_name, int typeflag)
+{
+ char const *link_name = safer_name_suffix (current_stat_info.link_name,
+ true, absolute_names_option);
+ int interdir_made = 0;
- if (to_stdout_option)
- {
- fd = 1;
- goto extract_file;
- }
+ do
+ {
+ struct stat st1, st2;
+ int e;
+ int status = link (link_name, file_name);
+ e = errno;
- if (!unlink_destination (CURRENT_FILE_NAME))
+ if (status == 0)
{
- if (current_header->oldgnu_header.isextended)
- skip_extended_headers ();
- skip_file (current_stat.st_size);
- if (backup_option)
- undo_last_backup ();
- break;
+ struct delayed_symlink *ds = delayed_symlink_head;
+ if (ds && lstat (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 (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;
-#if O_CTG
- /* Contiguous files (on the Masscomp) have to specify the size in
- the open call that creates them. */
+ errno = e;
+ }
+ while (maybe_recoverable (file_name, &interdir_made));
- 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 (!(incremental_option && errno == EEXIST))
+ {
+ link_error (link_name, file_name);
+ return 1;
+ }
+ return 0;
+}
-#else /* not O_CTG */
- if (typeflag == CONTTYPE)
- {
- static int conttype_diagnosed = 0;
+static int
+extract_symlink (char *file_name, int typeflag)
+{
+#ifdef HAVE_SYMLINK
+ int status, fd;
+ int interdir_made = 0;
- if (!conttype_diagnosed)
- {
- conttype_diagnosed = 1;
- WARN ((0, 0, _("Extracting contiguous files as regular files")));
- }
- }
- fd = open (CURRENT_FILE_NAME, openflag, current_stat.st_mode);
+ if (absolute_names_option
+ || ! (IS_ABSOLUTE_FILE_NAME (current_stat_info.link_name)
+ || contains_dot_dot (current_stat_info.link_name)))
+ {
+ while ((status = symlink (current_stat_info.link_name, file_name)))
+ if (!maybe_recoverable (file_name, &interdir_made))
+ break;
-#endif /* not O_CTG */
+ if (status == 0)
+ set_stat (file_name, ¤t_stat_info.stat, 0, 0, 0, SYMTYPE);
+ else
+ symlink_error (current_stat_info.link_name, 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 (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 ();
+ while ((fd = open (file_name, O_WRONLY | O_CREAT | O_EXCL, 0)) < 0)
+ if (! maybe_recoverable (file_name, &interdir_made))
break;
- }
- extract_file:
- if (typeflag == GNUTYPE_SPARSE)
+ status = -1;
+ if (fd < 0)
+ open_error (file_name);
+ else if (fstat (fd, &st) != 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 = (char *) 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);
+ stat_error (file_name);
+ close (fd);
}
+ else if (close (fd) != 0)
+ close_error (file_name);
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 == NULL)
- {
- 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; /* FIXME: errno should be read-only */
- 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, NULL);
-
- /* 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. */
+ {
+ struct delayed_set_stat *h;
+ struct delayed_symlink *p = xmalloc (offsetof (struct delayed_symlink, target)
+ + strlen (current_stat_info.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_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_symlinks
+ && strncmp (file_name, h->file_name, h->file_name_len) == 0
+ && ISSLASH (file_name[h->file_name_len])
+ && (base_name (file_name) == file_name + h->file_name_len + 1))
+ {
+ do
+ {
+ h->after_symlinks = 1;
- if (to_stdout_option)
- break;
+ if (stat (h->file_name, &st) != 0)
+ stat_error (h->file_name);
+ else
+ {
+ h->stat_info.st_dev = st.st_dev;
+ h->stat_info.st_ino = st.st_ino;
+ }
+ }
+ while ((h = h->next) && ! h->after_symlinks);
+ }
- status = close (fd);
- if (status < 0)
- {
- ERROR ((0, errno, _("%s: Error while closing"), CURRENT_FILE_NAME));
- if (backup_option)
- undo_last_backup ();
+ status = 0;
}
+ }
- set_stat (CURRENT_FILE_NAME, ¤t_stat, 0);
- break;
+ return status;
- case SYMTYPE:
- if (to_stdout_option)
- break;
+#else
+ static int warned_once;
-#ifdef HAVE_SYMLINK
- if (!unlink_destination (CURRENT_FILE_NAME))
- break;
+ if (!warned_once)
+ {
+ warned_once = 1;
+ WARN ((0, 0, _("Attempting extraction of symbolic links as hard links")));
+ }
+ return extract_link (file_name, typeflag);
+#endif
+}
- while (status = symlink (current_link_name, CURRENT_FILE_NAME),
- status != 0)
- if (!maybe_recoverable (CURRENT_FILE_NAME))
- break;
+#if S_IFCHR || S_IFBLK
+static int
+extract_node (char *file_name, int typeflag)
+{
+ int status;
+ int interdir_made = 0;
- if (status == 0)
+ do
+ status = mknod (file_name, current_stat_info.stat.st_mode,
+ current_stat_info.stat.st_rdev);
+ while (status && maybe_recoverable (file_name, &interdir_made));
- /* 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. */
+ if (status != 0)
+ mknod_error (file_name);
+ else
+ set_stat (file_name, ¤t_stat_info.stat, 0, 0, ARCHIVED_PERMSTATUS, typeflag);
+ return status;
+}
+#endif
- set_stat (CURRENT_FILE_NAME, ¤t_stat, 1);
+#if HAVE_MKFIFO || defined mkfifo
+static int
+extract_fifo (char *file_name, int typeflag)
+{
+ int status;
+ int interdir_made = 0;
- else
- {
- ERROR ((0, errno, _("%s: Could not create symlink to `%s'"),
- CURRENT_FILE_NAME, current_link_name));
- if (backup_option)
- undo_last_backup ();
- }
+ while ((status = mkfifo (file_name, current_stat_info.stat.st_mode)))
+ if (!maybe_recoverable (file_name, &interdir_made))
break;
-#else
- {
- static int warned_once = 0;
+ if (status == 0)
+ set_stat (file_name, ¤t_stat_info.stat, NULL, 0,
+ ARCHIVED_PERMSTATUS, typeflag);
+ else
+ mkfifo_error (file_name);
+ return status;
+}
+#endif
- if (!warned_once)
- {
- warned_once = 1;
- WARN ((0, 0,
- _("Attempting extraction of symbolic links as hard links")));
- }
- }
- /* Fall through. */
+static int
+extract_mangle_wrapper (char *file_name, int typeflag)
+{
+ extract_mangle ();
+ return 0;
+}
-#endif
- case LNKTYPE:
- if (to_stdout_option)
- break;
+static int
+extract_failure (char *file_name, int typeflag)
+{
+ return 1;
+}
- if (!unlink_destination (CURRENT_FILE_NAME))
- break;
+typedef int (*tar_extractor_t) (char *file_name, int typeflag);
- again_link:
- {
- struct stat st1, st2;
+\f
- /* MSDOS does not implement links. However, djgpp's link() actually
- copies the file. */
- status = link (current_link_name, CURRENT_FILE_NAME);
+/* Prepare to extract a file. Find extractor function.
+ Return zero if extraction should not proceed. */
- if (status == 0)
- break;
- if (maybe_recoverable (CURRENT_FILE_NAME))
- goto again_link;
+static int
+prepare_to_extract (char const *file_name, int typeflag, tar_extractor_t *fun)
+{
+ int rc = 1;
- 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 (EXTRACT_OVER_PIPE)
+ rc = 0;
- ERROR ((0, errno, _("%s: Could not link to `%s'"),
- CURRENT_FILE_NAME, current_link_name));
- if (backup_option)
- undo_last_backup ();
- }
+ /* 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
+ {
+ *fun = extract_file;
+ rc = 1;
+ }
+ break;
+
+ case SYMTYPE:
+ *fun = extract_symlink;
+ break;
+
+ case LNKTYPE:
+ *fun = extract_link;
break;
#if S_IFCHR
case CHRTYPE:
- current_stat.st_mode |= S_IFCHR;
- goto make_node;
+ current_stat_info.stat.st_mode |= S_IFCHR;
+ *fun = extract_node;
+ break;
#endif
#if S_IFBLK
case BLKTYPE:
- current_stat.st_mode |= S_IFBLK;
+ current_stat_info.stat.st_mode |= S_IFBLK;
+ *fun = extract_node;
+ break;
#endif
-#if S_IFCHR || S_IFBLK
- make_node:
- if (to_stdout_option)
- break;
+#if HAVE_MKFIFO || defined mkfifo
+ case FIFOTYPE:
+ *fun = extract_fifo;
+ break;
+#endif
- if (!unlink_destination (CURRENT_FILE_NAME))
- break;
+ case DIRTYPE:
+ case GNUTYPE_DUMPDIR:
+ *fun = extract_dir;
+ break;
- status = mknod (CURRENT_FILE_NAME, current_stat.st_mode,
- current_stat.st_rdev);
- if (status != 0)
- {
- if (maybe_recoverable (CURRENT_FILE_NAME))
- goto make_node;
+ case GNUTYPE_VOLHDR:
+ if (verbose_option)
+ fprintf (stdlis, _("Reading %s\n"), quote (current_stat_info.file_name));
+ *fun = NULL;
+ break;
- ERROR ((0, errno, _("%s: Could not make node"), CURRENT_FILE_NAME));
- if (backup_option)
- undo_last_backup ();
- break;
- };
- set_stat (CURRENT_FILE_NAME, ¤t_stat, 0);
+ case GNUTYPE_NAMES:
+ *fun = extract_mangle_wrapper;
break;
-#endif
-#if HAVE_MKFIFO || defined mkfifo
- case FIFOTYPE:
- if (to_stdout_option)
- break;
+ case GNUTYPE_MULTIVOL:
+ ERROR ((0, 0,
+ _("%s: Cannot extract -- file is continued from another volume"),
+ quotearg_colon (current_stat_info.file_name)));
+ *fun = extract_failure;
+ break;
- if (!unlink_destination (CURRENT_FILE_NAME))
- break;
+ case GNUTYPE_LONGNAME:
+ case GNUTYPE_LONGLINK:
+ ERROR ((0, 0, _("Unexpected long name header")));
+ *fun = extract_failure;
+ break;
- while (status = mkfifo (CURRENT_FILE_NAME, current_stat.st_mode),
- status != 0)
- if (!maybe_recoverable (CURRENT_FILE_NAME))
- break;
+ default:
+ WARN ((0, 0,
+ _("%s: Unknown file type `%c', extracted as normal file"),
+ quotearg_colon (file_name), typeflag));
+ *fun = extract_file;
+ }
- if (status == 0)
- set_stat (CURRENT_FILE_NAME, ¤t_stat, 0);
- else
+ /* 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)
{
- ERROR ((0, errno, _("%s: Could not make fifo"), CURRENT_FILE_NAME));
- if (backup_option)
- undo_last_backup ();
+ unlink_error (file_name);
+ return 0;
}
break;
-#endif
- case DIRTYPE:
- case GNUTYPE_DUMPDIR:
- name_length = strlen (CURRENT_FILE_NAME) - 1;
+ case KEEP_NEWER_FILES:
+ if (file_newer_p (file_name, ¤t_stat_info))
+ {
+ WARN ((0, 0, _("Current %s is newer or same age"),
+ quote (file_name)));
+ return 0;
+ }
+ break;
- 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';
+ default:
+ break;
+ }
- if (incremental_option)
- {
- /* Read the entry and delete files that aren't listed in the
- archive. */
+ return 1;
+}
- gnu_restore (skipcrud);
- }
- else if (typeflag == GNUTYPE_DUMPDIR)
- skip_file (current_stat.st_size);
+/* Extract a file from the archive. */
+void
+extract_archive (void)
+{
+ char typeflag;
+ char *file_name;
+ tar_extractor_t fun;
- if (to_stdout_option)
- break;
+ set_next_block_after (current_header);
+ decode_header (current_header, ¤t_stat_info, ¤t_format, 1);
- 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 (interactive_option && !confirm ("extract", current_stat_info.file_name))
+ {
+ skip_member ();
+ return;
+ }
- if (stat (CURRENT_FILE_NAME, &st1) == 0 && S_ISDIR (st1.st_mode))
- goto check_perms;
+ /* Print the block from current_header and current_stat. */
- errno = saved_errno; /* FIXME: errno should be read-only */
- }
+ if (verbose_option)
+ print_header (¤t_stat_info, -1);
- if (maybe_recoverable (CURRENT_FILE_NAME))
- goto again_dir;
+ file_name = safer_name_suffix (current_stat_info.file_name,
+ false, absolute_names_option);
+ if (strip_name_components)
+ {
+ size_t prefix_len = stripped_prefix_len (file_name, strip_name_components);
+ if (prefix_len == (size_t) -1)
+ {
+ skip_member ();
+ return;
+ }
+ file_name += prefix_len;
+ }
- /* If we're trying to create '.', let it be. */
+ apply_nonancestor_delayed_set_stat (file_name, 0);
- /* FIXME: Strange style... */
+ /* Take a safety backup of a previously existing file. */
- if (CURRENT_FILE_NAME[name_length] == '.'
- && (name_length == 0
- || CURRENT_FILE_NAME[name_length - 1] == '/'))
- goto check_perms;
+ if (backup_option)
+ if (!maybe_backup_file (file_name, 0))
+ {
+ int e = errno;
+ ERROR ((0, e, _("%s: Was unable to backup this file"),
+ quotearg_colon (file_name)));
+ skip_member ();
+ return;
+ }
- ERROR ((0, errno, _("%s: Could not create directory"),
- CURRENT_FILE_NAME));
- if (backup_option)
- undo_last_backup ();
- break;
- }
+ /* Extract the archive entry according to its type. */
- 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));
- }
+ /* KLUDGE */
+ typeflag = sparse_member_p (¤t_stat_info) ?
+ GNUTYPE_SPARSE : current_header->header.typeflag;
-#if !MSDOS
- /* MSDOS does not associate timestamps with directories. In this
- case, no need to try delaying their restoration. */
+ if (prepare_to_extract (file_name, typeflag, &fun))
+ {
+ if (fun && (*fun) (file_name, typeflag) && backup_option)
+ undo_last_backup ();
+ }
+ else
+ skip_member ();
- if (touch_option)
+}
- /* 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. */
+/* Extract the symbolic links whose final extraction were delayed. */
+static void
+apply_delayed_symlinks (void)
+{
+ struct delayed_symlink *ds;
- set_mode (CURRENT_FILE_NAME, ¤t_stat);
+ for (ds = delayed_symlink_head; ds; )
+ {
+ struct string_list *sources = ds->sources;
+ char const *valid_source = 0;
- else
+ for (sources = ds->sources; sources; sources = sources->next)
{
- data = ((struct delayed_set_stat *)
- 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;
+ char const *source = sources->string;
+ struct stat st;
+
+ /* Make sure the placeholder file is still there. If not,
+ don't create a symlink, 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
+ && st.st_mtime == ds->mtime)
+ {
+ /* 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 (symlink (ds->target, source) != 0)
+ symlink_error (ds->target, source);
+ else
+ {
+ valid_source = source;
+ st.st_uid = ds->uid;
+ st.st_gid = ds->gid;
+ set_stat (source, &st, 0, 0, 0, SYMTYPE);
+ }
+ }
}
-#endif /* !MSDOS */
- break;
- case GNUTYPE_VOLHDR:
- if (verbose_option)
- fprintf (stdlis, _("Reading %s\n"), current_file_name);
- break;
+ for (sources = ds->sources; sources; )
+ {
+ struct string_list *next = sources->next;
+ free (sources);
+ sources = next;
+ }
- case GNUTYPE_NAMES:
- extract_mangle ();
- break;
+ {
+ struct delayed_symlink *next = ds->next;
+ free (ds);
+ ds = next;
+ }
+ }
- 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 ();
- break;
+ delayed_symlink_head = 0;
+}
- 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 ();
- break;
+/* Finish the extraction of an archive. */
+void
+extract_finish (void)
+{
+ /* First, fix the status of ordinary directories that need fixing. */
+ apply_nonancestor_delayed_set_stat ("", 0);
- default:
- WARN ((0, 0,
- _("Unknown file type '%c' for %s, extracted as normal file"),
- typeflag, CURRENT_FILE_NAME));
- goto again_file;
- }
+ /* Then, apply delayed symlinks, so that they don't affect delayed
+ directory status-setting for ordinary directories. */
+ apply_delayed_symlinks ();
-#undef CURRENT_FILE_NAME
+ /* Finally, fix the status of directories that are ancestors
+ of delayed symlinks. */
+ apply_nonancestor_delayed_set_stat ("", 1);
}
-/*----------------------------------------------------------------.
-| Set back the utime and mode for all the extracted directories. |
-`----------------------------------------------------------------*/
-
void
-apply_delayed_set_stat (void)
+fatal_exit (void)
{
- struct delayed_set_stat *data;
+ extract_finish ();
+ error (TAREXIT_FAILURE, 0, _("Error is not recoverable: exiting now"));
+ abort ();
+}
- while (delayed_set_stat_head != NULL)
- {
- 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);
- }
+void
+xalloc_die (void)
+{
+ error (0, 0, "%s", _("memory exhausted"));
+ fatal_exit ();
}
projects / chaz / tar / blobdiff