/* 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 Free Software Foundation, Inc.
Written by John Gilmore, on 1985-11-19.
#include "system.h"
#include <quotearg.h>
+#include <errno.h>
#if HAVE_UTIME_H
# include <utime.h>
#include "common.h"
-int we_are_root; /* true if our effective uid == 0 */
+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) */
};
/* 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_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;
size_t file_name_len;
mode_t invert_permissions;
enum permstatus permstatus;
+ bool after_symlinks;
char file_name[1];
};
}
/* 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
-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)
{
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)
check_time (char const *file_name, time_t t)
{
time_t now;
- if (start_time < t && (now = time (0)) < t)
+ if (t <= 0)
+ WARN ((0, 0, _("%s: implausibly old time stamp %s"),
+ file_name, tartime (t)));
+ else 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)));
}
/* 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.
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 stat const *stat_info,
+ struct stat const *cur_info,
mode_t invert_permissions, enum permstatus permstatus,
char typeflag)
{
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, utimbuf.actime);
+ check_time (file_name, utimbuf.modtime);
}
}
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);
}
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,
+ set_mode (file_name, stat_info, 0,
invert_permissions, permstatus, typeflag);
}
}
{
size_t file_name_len = strlen (file_name);
struct delayed_set_stat *data =
- xmalloc (offsetof (struct delayed_set_stat, file_name) + file_name_len);
+ 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;
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->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;
}
invert_permissions is zero, because
repair_delayed_set_stat may need to update the struct. */
delay_set_stat (file_name,
- ¤t_stat /* ignored */,
+ ¤t_stat_info.stat /* ignored */,
invert_permissions, INTERDIR_PERMSTATUS);
print_for_mkdir (file_name, cursor - file_name, mode);
*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. */
Return zero if extraction should not proceed. */
static int
-prepare_to_extract (char const *file_name)
+prepare_to_extract (char const *file_name, bool directory)
{
if (to_stdout_option)
return 0;
return 0;
case DEFAULT_OLD_FILES:
+ case NO_OVERWRITE_DIR_OLD_FILES:
case OVERWRITE_OLD_FILES:
{
int r = remove_any_file (file_name, 0);
}
}
-static void
-extract_sparse_file (int fd, off_t *sizeleft, off_t totalsize, char *name)
+/* Translate the sparse information on the header, and in any
+ subsequent extended headers, into an array of structures with true
+ numbers, as opposed to character strings. Return nonzero if
+ successful.
+
+ This function invalidates current_header. */
+
+bool
+fill_in_sparse_array (void)
{
- int sparse_ind = 0;
+ off_t sparse_data_size = current_stat_info.stat.st_size;
+ off_t file_size = OFF_FROM_HEADER (current_header->oldgnu_header.realsize);
+ int sparses;
+ int counter;
+ union block *h = current_header;
+
+ init_sparsearray ();
+
+ for (sparses = 0; sparses < SPARSES_IN_OLDGNU_HEADER; sparses++)
+ {
+ struct sparse const *s = &h->oldgnu_header.sp[sparses];
+ off_t offset;
+ size_t numbytes;
+ if (s->numbytes[0] == '\0')
+ break;
+ sparsearray[sparses].offset = offset = OFF_FROM_HEADER (s->offset);
+ sparsearray[sparses].numbytes = numbytes =
+ SIZE_FROM_HEADER (s->numbytes);
+ sparse_data_size -= numbytes;
+ if (offset < 0 || file_size < offset + numbytes || sparse_data_size < 0)
+ goto invalid_member;
+ }
+
+ if (h->oldgnu_header.isextended)
+ do
+ {
+ h = find_next_block ();
+ if (! h)
+ {
+ ERROR ((0, 0, _("Unexpected EOF in archive")));
+ return 0;
+ }
+
+ for (counter = 0; counter < SPARSES_IN_SPARSE_HEADER; counter++)
+ {
+ struct sparse const *s = &h->sparse_header.sp[counter];
+ off_t offset;
+ size_t numbytes;
+ if (s->numbytes[0] == '\0')
+ break;
+
+ if (sparses == sp_array_size)
+ {
+ sp_array_size *= 2;
+ sparsearray =
+ xrealloc (sparsearray,
+ sp_array_size * sizeof *sparsearray);
+ }
+
+ sparsearray[sparses].offset = offset =
+ OFF_FROM_HEADER (s->offset);
+ sparsearray[sparses].numbytes = numbytes =
+ SIZE_FROM_HEADER (s->numbytes);
+ sparse_data_size -= numbytes;
+ if (offset < 0 || file_size < offset + numbytes
+ || sparse_data_size < 0)
+ goto invalid_member;
+ sparses++;
+ }
+
+ set_next_block_after (h);
+
+ } while (h->sparse_header.isextended);
+
+ return 1;
+
+ invalid_member:
+ ERROR ((0, 0, _("%s: invalid sparse archive member"),
+ current_stat_info.file_name));
+ return 0;
+}
- /* assuming sizeleft is initially totalsize */
- while (*sizeleft > 0)
+static off_t
+extract_sparse_file (int fd, char const *name,
+ off_t sizeleft, off_t file_size)
+{
+ int sparse_ind = 0;
+
+ while (sizeleft != 0)
{
size_t written;
size_t count;
if (! data_block)
{
ERROR ((0, 0, _("Unexpected EOF in archive")));
- return;
+ return sizeleft;
}
if (lseek (fd, sparsearray[sparse_ind].offset, SEEK_SET) < 0)
{
seek_error_details (name, sparsearray[sparse_ind].offset);
- return;
+ return sizeleft;
}
written = sparsearray[sparse_ind++].numbytes;
while (written > BLOCKSIZE)
{
count = full_write (fd, data_block->buffer, BLOCKSIZE);
written -= count;
- *sizeleft -= count;
+ sizeleft -= count;
if (count != BLOCKSIZE)
{
write_error_details (name, count, BLOCKSIZE);
- return;
+ return sizeleft;
}
set_next_block_after (data_block);
data_block = find_next_block ();
if (! data_block)
{
ERROR ((0, 0, _("Unexpected EOF in archive")));
- return;
+ return sizeleft;
}
}
count = full_write (fd, data_block->buffer, written);
- *sizeleft -= count;
+ sizeleft -= count;
if (count != written)
{
write_error_details (name, count, written);
- return;
+ return sizeleft;
}
set_next_block_after (data_block);
}
+
+ if (ftruncate (fd, file_size) != 0)
+ truncate_error (name);
+
+ return 0;
}
/* Fix the statuses of all directories whose statuses need fixing, and
- which are not ancestors of FILE_NAME. */
+ 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
-apply_nonancestor_delayed_set_stat (char const *file_name)
+apply_nonancestor_delayed_set_stat (char const *file_name, bool after_symlinks)
{
size_t file_name_len = strlen (file_name);
+ bool check_for_renamed_directories = 0;
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)
+ 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)
+ {
+ 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;
+ }
+ }
+
+ 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;
- set_stat (data->file_name, &data->stat_info,
- data->invert_permissions, data->permstatus, DIRTYPE);
free (data);
}
}
int fd;
int status;
size_t count;
- size_t name_length;
size_t written;
int openflag;
mode_t mode;
off_t size;
- size_t skipcrud;
- int counter;
+ off_t file_size;
int interdir_made = 0;
char typeflag;
- union block *exhdr;
-
-#define CURRENT_FILE_NAME (skipcrud + current_file_name)
+ char *file_name;
set_next_block_after (current_header);
- decode_header (current_header, ¤t_stat, ¤t_format, 1);
+ decode_header (current_header, ¤t_stat_info, ¤t_format, 1);
- if (interactive_option && !confirm ("extract", current_file_name))
+ if (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 ();
+ print_header (-1);
- /* Check for fully specified file names and other atrocities. */
-
- skipcrud = 0;
- if (! absolute_names_option)
+ file_name = safer_name_suffix (current_stat_info.file_name, 0);
+ if (strip_path_elements)
{
- if (contains_dot_dot (CURRENT_FILE_NAME))
+ size_t prefix_len = stripped_prefix_len (file_name, strip_path_elements);
+ if (prefix_len == (size_t) -1)
{
- 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++;
-
- 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));
- }
- }
+ file_name += prefix_len;
}
-
- apply_nonancestor_delayed_set_stat (CURRENT_FILE_NAME);
+
+ apply_nonancestor_delayed_set_stat (file_name, 0);
/* Take a safety backup of a previously existing file. */
if (backup_option && !to_stdout_option)
- if (!maybe_backup_file (CURRENT_FILE_NAME, 0))
+ if (!maybe_backup_file (file_name, 0))
{
int e = errno;
ERROR ((0, e, _("%s: Was unable to backup this file"),
- quotearg_colon (CURRENT_FILE_NAME)));
+ quotearg_colon (file_name)));
skip_member ();
return;
}
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. */
-
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 = ¤t_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)
- {
- /* 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)
- {
- exhdr = find_next_block ();
- if (! exhdr)
- {
- ERROR ((0, 0, _("Unexpected EOF in archive")));
- return;
- }
- for (counter = 0; counter < SPARSES_IN_SPARSE_HEADER; counter++)
- {
- 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);
- }
- if (!exhdr->sparse_header.isextended)
- break;
- else
- {
- ind += SPARSES_IN_SPARSE_HEADER;
- set_next_block_after (exhdr);
- }
- }
- set_next_block_after (exhdr);
- }
+ file_size = OFF_FROM_HEADER (current_header->oldgnu_header.realsize);
+ if (! fill_in_sparse_array ())
+ return;
/* Fall through. */
case AREGTYPE:
/* Appears to be a file. But BSD tar uses the convention that a slash
suffix means a directory. */
- name_length = strlen (CURRENT_FILE_NAME);
- if (FILESYSTEM_PREFIX_LEN (CURRENT_FILE_NAME) < name_length
- && CURRENT_FILE_NAME[name_length - 1] == '/')
+ if (current_stat_info.had_trailing_slash)
goto really_dir;
/* FIXME: deal with protection issues. */
| (old_files_option == OVERWRITE_OLD_FILES
? O_TRUNC
: O_EXCL));
- mode = current_stat.st_mode & MODE_RWX & ~ current_umask;
+ mode = current_stat_info.stat.st_mode & MODE_RWX & ~ current_umask;
if (to_stdout_option)
{
goto extract_file;
}
- if (! prepare_to_extract (CURRENT_FILE_NAME))
+ if (! prepare_to_extract (file_name, 0))
{
skip_member ();
if (backup_option)
the open call that creates them. */
if (typeflag == CONTTYPE)
- fd = open (CURRENT_FILE_NAME, openflag | O_CTG,
- mode, current_stat.st_size);
+ fd = open (file_name, openflag | O_CTG, mode, current_stat_info.stat.st_size);
else
- fd = open (CURRENT_FILE_NAME, openflag, mode);
+ fd = open (file_name, openflag, mode);
#else /* not O_CTG */
if (typeflag == CONTTYPE)
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 */
if (fd < 0)
{
- if (maybe_recoverable (CURRENT_FILE_NAME, &interdir_made))
+ if (maybe_recoverable (file_name, &interdir_made))
goto again_file;
- open_error (CURRENT_FILE_NAME);
+ open_error (file_name);
skip_member ();
if (backup_option)
undo_last_backup ();
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_length_bis = strlen (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);
+ memcpy (name, file_name, name_length_bis);
+ size = extract_sparse_file (fd, name,
+ current_stat_info.stat.st_size, file_size);
free (sparsearray);
}
else
- for (size = current_stat.st_size; size > 0; )
+ for (size = current_stat_info.stat.st_size; size > 0; )
{
if (multi_volume_option)
{
- assign_string (&save_name, current_file_name);
- save_totsize = current_stat.st_size;
+ assign_string (&save_name, current_stat_info.file_name);
+ save_totsize = current_stat_info.stat.st_size;
save_sizeleft = size;
}
(data_block->buffer + written - 1));
if (count != written)
{
- write_error_details (CURRENT_FILE_NAME, count, written);
+ write_error_details (file_name, count, written);
break;
}
}
status = close (fd);
if (status < 0)
{
- close_error (CURRENT_FILE_NAME);
+ close_error (file_name);
if (backup_option)
undo_last_backup ();
}
- set_stat (CURRENT_FILE_NAME, ¤t_stat, 0,
+ set_stat (file_name, ¤t_stat_info.stat, 0, 0,
(old_files_option == OVERWRITE_OLD_FILES
? UNKNOWN_PERMSTATUS
: ARCHIVED_PERMSTATUS),
case SYMTYPE:
#ifdef HAVE_SYMLINK
- if (! prepare_to_extract (CURRENT_FILE_NAME))
+ if (! prepare_to_extract (file_name, 0))
break;
if (absolute_names_option
- || ! (ISSLASH (current_link_name
- [FILESYSTEM_PREFIX_LEN (current_link_name)])
- || contains_dot_dot (current_link_name)))
+ || ! (ISSLASH (current_stat_info.link_name
+ [FILESYSTEM_PREFIX_LEN (current_stat_info.link_name)])
+ || contains_dot_dot (current_stat_info.link_name)))
{
- while (status = symlink (current_link_name, CURRENT_FILE_NAME),
+ while (status = symlink (current_stat_info.link_name, file_name),
status != 0)
- if (!maybe_recoverable (CURRENT_FILE_NAME, &interdir_made))
+ if (!maybe_recoverable (file_name, &interdir_made))
break;
if (status == 0)
- set_stat (CURRENT_FILE_NAME, ¤t_stat, 0, 0, SYMTYPE);
+ set_stat (file_name, ¤t_stat_info.stat, 0, 0, 0, SYMTYPE);
else
- symlink_error (current_link_name, CURRENT_FILE_NAME);
+ symlink_error (current_stat_info.link_name, file_name);
}
else
{
will be replaced after other extraction is done. */
struct stat st;
- while (fd = open (CURRENT_FILE_NAME, O_WRONLY | O_CREAT | O_EXCL, 0),
+ while (fd = open (file_name, O_WRONLY | O_CREAT | O_EXCL, 0),
fd < 0)
- if (! maybe_recoverable (CURRENT_FILE_NAME, &interdir_made))
+ if (! maybe_recoverable (file_name, &interdir_made))
break;
status = -1;
if (fd < 0)
- open_error (CURRENT_FILE_NAME);
+ open_error (file_name);
else if (fstat (fd, &st) != 0)
{
- stat_error (CURRENT_FILE_NAME);
+ stat_error (file_name);
close (fd);
}
else if (close (fd) != 0)
- close_error (CURRENT_FILE_NAME);
+ close_error (file_name);
else
{
- size_t filelen = strlen (CURRENT_FILE_NAME);
- size_t linklen = strlen (current_link_name);
+ struct delayed_set_stat *h;
struct delayed_symlink *p =
xmalloc (offsetof (struct delayed_symlink, target)
- + linklen + 1);
+ + 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.st_uid;
- p->gid = current_stat.st_gid;
+ p->uid = current_stat_info.stat.st_uid;
+ p->gid = current_stat_info.stat.st_gid;
p->sources = xmalloc (offsetof (struct string_list, string)
- + filelen + 1);
+ + strlen (file_name) + 1);
p->sources->next = 0;
- memcpy (p->sources->string, CURRENT_FILE_NAME, filelen + 1);
- memcpy (p->target, current_link_name, linklen + 1);
+ 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 (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 = 0;
}
}
#endif
case LNKTYPE:
- if (! prepare_to_extract (CURRENT_FILE_NAME))
+ if (! prepare_to_extract (file_name, 0))
break;
again_link:
{
+ char const *link_name = safer_name_suffix (current_stat_info.link_name, 1);
struct stat st1, st2;
int e;
/* MSDOS does not implement links. However, djgpp's link() actually
copies the file. */
- status = link (current_link_name, CURRENT_FILE_NAME);
+ status = link (link_name, file_name);
if (status == 0)
{
struct delayed_symlink *ds = delayed_symlink_head;
- if (ds && stat (current_link_name, &st1) == 0)
+ if (ds && stat (link_name, &st1) == 0)
for (; ds; ds = ds->next)
if (ds->dev == st1.st_dev
&& ds->ino == st1.st_ino
{
struct string_list *p =
xmalloc (offsetof (struct string_list, string)
- + strlen (CURRENT_FILE_NAME) + 1);
- strcpy (p->string, CURRENT_FILE_NAME);
+ + strlen (file_name) + 1);
+ strcpy (p->string, file_name);
p->next = ds->sources;
ds->sources = p;
break;
}
break;
}
- if (maybe_recoverable (CURRENT_FILE_NAME, &interdir_made))
+ if (maybe_recoverable (file_name, &interdir_made))
goto again_link;
if (incremental_option && errno == EEXIST)
break;
e = errno;
- if (stat (current_link_name, &st1) == 0
- && stat (CURRENT_FILE_NAME, &st2) == 0
+ if (stat (link_name, &st1) == 0
+ && stat (file_name, &st2) == 0
&& st1.st_dev == st2.st_dev
&& st1.st_ino == st2.st_ino)
break;
- link_error (current_link_name, CURRENT_FILE_NAME);
+ link_error (link_name, file_name);
if (backup_option)
undo_last_backup ();
}
#if S_IFCHR
case CHRTYPE:
- current_stat.st_mode |= S_IFCHR;
+ current_stat_info.stat.st_mode |= S_IFCHR;
goto make_node;
#endif
#if S_IFBLK
case BLKTYPE:
- current_stat.st_mode |= S_IFBLK;
+ current_stat_info.stat.st_mode |= S_IFBLK;
#endif
#if S_IFCHR || S_IFBLK
make_node:
- if (! prepare_to_extract (CURRENT_FILE_NAME))
+ if (! prepare_to_extract (file_name, 0))
break;
- status = mknod (CURRENT_FILE_NAME, current_stat.st_mode,
- current_stat.st_rdev);
+ status = mknod (file_name, current_stat_info.stat.st_mode,
+ current_stat_info.stat.st_rdev);
if (status != 0)
{
- if (maybe_recoverable (CURRENT_FILE_NAME, &interdir_made))
+ if (maybe_recoverable (file_name, &interdir_made))
goto make_node;
- mknod_error (CURRENT_FILE_NAME);
+ mknod_error (file_name);
if (backup_option)
undo_last_backup ();
break;
};
- set_stat (CURRENT_FILE_NAME, ¤t_stat, 0,
+ set_stat (file_name, ¤t_stat_info.stat, 0, 0,
ARCHIVED_PERMSTATUS, typeflag);
break;
#endif
#if HAVE_MKFIFO || defined mkfifo
case FIFOTYPE:
- if (! prepare_to_extract (CURRENT_FILE_NAME))
+ if (! prepare_to_extract (file_name, 0))
break;
- while (status = mkfifo (CURRENT_FILE_NAME, current_stat.st_mode),
+ while (status = mkfifo (file_name, current_stat_info.stat.st_mode),
status != 0)
- if (!maybe_recoverable (CURRENT_FILE_NAME, &interdir_made))
+ if (!maybe_recoverable (file_name, &interdir_made))
break;
if (status == 0)
- set_stat (CURRENT_FILE_NAME, ¤t_stat, 0,
+ set_stat (file_name, ¤t_stat_info.stat, NULL, 0,
ARCHIVED_PERMSTATUS, typeflag);
else
{
- mkfifo_error (CURRENT_FILE_NAME);
+ mkfifo_error (file_name);
if (backup_option)
undo_last_backup ();
}
case DIRTYPE:
case GNUTYPE_DUMPDIR:
- name_length = strlen (CURRENT_FILE_NAME);
-
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';
-
if (incremental_option)
{
/* Read the entry and delete files that aren't listed in the
archive. */
- gnu_restore (skipcrud);
+ gnu_restore (file_name);
}
else if (typeflag == GNUTYPE_DUMPDIR)
skip_member ();
- if (! prepare_to_extract (CURRENT_FILE_NAME))
- break;
-
- mode = ((current_stat.st_mode
+ mode = ((current_stat_info.stat.st_mode
| (we_are_root ? 0 : MODE_WXUSR))
& MODE_RWX);
+ status = prepare_to_extract (file_name, 1);
+ if (status == 0)
+ break;
+ if (status < 0)
+ goto directory_exists;
+
again_dir:
- status = mkdir (CURRENT_FILE_NAME, mode);
+ status = mkdir (file_name, mode);
if (status != 0)
{
if (errno == EEXIST
- && (interdir_made || old_files_option == OVERWRITE_OLD_FILES))
+ && (interdir_made
+ || old_files_option == DEFAULT_OLD_FILES
+ || old_files_option == OVERWRITE_OLD_FILES))
{
struct stat st;
- if (stat (CURRENT_FILE_NAME, &st) == 0)
+ if (stat (file_name, &st) == 0)
{
if (interdir_made)
{
- repair_delayed_set_stat (CURRENT_FILE_NAME, &st);
+ repair_delayed_set_stat (file_name, &st);
break;
}
if (S_ISDIR (st.st_mode))
errno = EEXIST;
}
- if (maybe_recoverable (CURRENT_FILE_NAME, &interdir_made))
+ if (maybe_recoverable (file_name, &interdir_made))
goto again_dir;
if (errno != EEXIST)
{
- mkdir_error (CURRENT_FILE_NAME);
+ mkdir_error (file_name);
if (backup_option)
undo_last_backup ();
break;
directory_exists:
if (status == 0
+ || old_files_option == DEFAULT_OLD_FILES
|| old_files_option == OVERWRITE_OLD_FILES)
- delay_set_stat (CURRENT_FILE_NAME, ¤t_stat,
- MODE_RWX & (mode ^ current_stat.st_mode),
+ delay_set_stat (file_name, ¤t_stat_info.stat,
+ MODE_RWX & (mode ^ current_stat_info.stat.st_mode),
(status == 0
? ARCHIVED_PERMSTATUS
: UNKNOWN_PERMSTATUS));
case GNUTYPE_VOLHDR:
if (verbose_option)
- fprintf (stdlis, _("Reading %s\n"), quote (current_file_name));
+ fprintf (stdlis, _("Reading %s\n"), quote (current_stat_info.file_name));
break;
case GNUTYPE_NAMES:
case GNUTYPE_MULTIVOL:
ERROR ((0, 0,
_("%s: Cannot extract -- file is continued from another volume"),
- quotearg_colon (current_file_name)));
+ quotearg_colon (current_stat_info.file_name)));
skip_member ();
if (backup_option)
undo_last_backup ();
default:
WARN ((0, 0,
_("%s: Unknown file type '%c', extracted as normal file"),
- quotearg_colon (CURRENT_FILE_NAME), typeflag));
+ quotearg_colon (file_name), typeflag));
goto again_file;
}
-
-#undef CURRENT_FILE_NAME
}
/* Extract the symbolic links whose final extraction were delayed. */
valid_source = source;
st.st_uid = ds->uid;
st.st_gid = ds->gid;
- set_stat (source, &st, 0, 0, SYMTYPE);
+ set_stat (source, &st, 0, 0, 0, SYMTYPE);
}
}
}
void
extract_finish (void)
{
- /* Apply delayed symlinks last, so that they don't affect
- delayed directory status-setting. */
- apply_nonancestor_delayed_set_stat ("");
+ /* First, fix the status of ordinary directories that need fixing. */
+ apply_nonancestor_delayed_set_stat ("", 0);
+
+ /* Then, apply delayed symlinks, so that they don't affect delayed
+ directory status-setting for ordinary directories. */
apply_delayed_symlinks ();
+
+ /* Finally, fix the status of directories that are ancestors
+ of delayed symlinks. */
+ apply_nonancestor_delayed_set_stat ("", 1);
}
void
projects / chaz / tar / blobdiff