This change replaces traditional functions like 'open' with the POSIX.1-2008 functions like 'openat'. Mostly this is an internal refactoring change, in preparation for further changes to close some races. * gnulib.modules: Add faccessat, linkat, mkfifoat, renameat, symlinkat. Remove save-cwd. * src/Makefile.am (tar_LDADD): Add $(LIB_EACCESS). * tests/Makefile.am (LDADD): Likewise. * src/common.h (chdir_fd): New extern var. * src/compare.c (diff_file, diff_multivol): Use openat instead of open. * src/create.c (create_archive, restore_parent_fd): Likewise. * src/extract.c (create_placeholder_file): Likewise. * src/names.c (collect_and_sort_names): Likewise. * src/update.c (append_file): Likewise. * src/compare.c (diff_symlink): Use readlinkat instead of readlink. * src/compare.c (diff_file): Use chdir_fd instead of AT_FDCWD. * src/create.c (subfile_open, dump_file0): Likewise. * src/extract.c (fd_chmod, fd_chown, fd_stat, set_stat): (repair_delayed_set_stat, apply_nonancestor_delayed_set_stat): Likewise. * src/extract.c (mark_after_links, file_newer_p, extract_dir): (extract_link, apply_delayed_links): Use fstatat rather than stat or lstat. * src/misc.c (maybe_backup_file, deref_stat): Likewise. * src/extract.c (make_directories): Use mkdirat rather than mkdir. Use faccessat rather than access. This fixes a minor permissions bug when tar is running setuid (who would want to do that?!). (open_output_file): Use openat rather than open. In the process, this removes support for Masscomp's O_CTG files, which aren't compatible with openat's signature. Masscomp! Wow! That's a blast from the past. As far as I know, that operating system hasn't been supported for more than 20 years. (extract_link, apply_delayed_links): Use linkat rather than link. (extract_symlink, apply_delayed_links): Use symlinkat rather than symlink. (extract_node): Use mknodat rather than mknod. (extract_fifo): Use mkfifoat rather than mkfifo. (apply_delayed_links): Use unlinkat rather than unlink or rmdir. * src/misc.c (safer_rmdir, remove_any_file): Likewise. * src/unlink.c (flush_deferred_unlinks): Likewise. * src/extract.c (rename_directory): Use renameat rather than rename. * src/misc.c (maybe_backup_file, undo_last_backup): Likewise. * src/misc.c: Don't include <save-cwd.h>; no longer needed now that we're using openat etc. (struct wd): Add member fd. Remove members err and fd. All uses changed. (CHDIR_CACHE_SIZE): New constant. (wdcache, wdcache_count, chdir_fd): New vars. (chdir_do): Use openat rather than save_cwd. Keep the cache up to date. This code won't scale well, but is good enough for now. * src/update.c (update_archive): Use openat + fdopendir + streamsavedir rather than savedir. This file is a placeholder. It will be replaced with the actual ChangeLog by make dist. Run make ChangeLog if you wish to create it earlier.
159 lines
3.7 KiB
C
159 lines
3.7 KiB
C
/* This file is part of GNU tar.
|
|
Copyright (C) 2009 Free Software Foundation, Inc.
|
|
|
|
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 3, or (at your option) any later
|
|
version.
|
|
|
|
This program is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
|
|
Public License for more details.
|
|
|
|
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.,
|
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
|
|
|
|
#include <system.h>
|
|
#include "common.h"
|
|
#include <quotearg.h>
|
|
|
|
struct deferred_unlink
|
|
{
|
|
struct deferred_unlink *next; /* Next unlink in the queue */
|
|
char *file_name; /* Absolute name of the file to unlink */
|
|
bool is_dir; /* True if file_name is a directory */
|
|
off_t records_written; /* Number of records written when this
|
|
entry got added to the queue */
|
|
};
|
|
|
|
/* The unlink queue */
|
|
static struct deferred_unlink *dunlink_head, *dunlink_tail;
|
|
|
|
/* Number of entries in the queue */
|
|
static size_t dunlink_count;
|
|
|
|
/* List of entries available for allocation */
|
|
static struct deferred_unlink *dunlink_avail;
|
|
|
|
/* Delay (number of records written) between adding entry to the
|
|
list and its actual removal. */
|
|
size_t deferred_unlink_delay = 0;
|
|
|
|
static struct deferred_unlink *
|
|
dunlink_alloc (void)
|
|
{
|
|
struct deferred_unlink *p;
|
|
if (dunlink_avail)
|
|
{
|
|
p = dunlink_avail;
|
|
dunlink_avail = p->next;
|
|
p->next = NULL;
|
|
}
|
|
else
|
|
p = xmalloc (sizeof (*p));
|
|
return p;
|
|
}
|
|
|
|
static void
|
|
dunlink_reclaim (struct deferred_unlink *p)
|
|
{
|
|
free (p->file_name);
|
|
p->next = dunlink_avail;
|
|
dunlink_avail = p;
|
|
}
|
|
|
|
static void
|
|
flush_deferred_unlinks (bool force)
|
|
{
|
|
struct deferred_unlink *p, *prev = NULL;
|
|
|
|
for (p = dunlink_head; p; )
|
|
{
|
|
struct deferred_unlink *next = p->next;
|
|
if (force
|
|
|| records_written > p->records_written + deferred_unlink_delay)
|
|
{
|
|
if (p->is_dir)
|
|
{
|
|
if (unlinkat (chdir_fd, p->file_name, AT_REMOVEDIR) != 0)
|
|
{
|
|
switch (errno)
|
|
{
|
|
case ENOENT:
|
|
/* nothing to worry about */
|
|
break;
|
|
case ENOTEMPTY:
|
|
if (!force)
|
|
{
|
|
/* Keep the record in list, in the hope we'll
|
|
be able to remove it later */
|
|
prev = p;
|
|
p = next;
|
|
continue;
|
|
}
|
|
/* fall through */
|
|
default:
|
|
rmdir_error (p->file_name);
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (unlinkat (chdir_fd, p->file_name, 0) != 0 && errno != ENOENT)
|
|
unlink_error (p->file_name);
|
|
}
|
|
dunlink_reclaim (p);
|
|
dunlink_count--;
|
|
p = next;
|
|
if (prev)
|
|
prev->next = p;
|
|
else
|
|
dunlink_head = p;
|
|
}
|
|
else
|
|
{
|
|
prev = p;
|
|
p = next;
|
|
}
|
|
}
|
|
if (!dunlink_head)
|
|
dunlink_tail = NULL;
|
|
}
|
|
|
|
void
|
|
finish_deferred_unlinks ()
|
|
{
|
|
flush_deferred_unlinks (true);
|
|
while (dunlink_avail)
|
|
{
|
|
struct deferred_unlink *next = dunlink_avail->next;
|
|
free (dunlink_avail);
|
|
dunlink_avail = next;
|
|
}
|
|
}
|
|
|
|
void
|
|
queue_deferred_unlink (const char *name, bool is_dir)
|
|
{
|
|
struct deferred_unlink *p;
|
|
|
|
if (dunlink_head
|
|
&& records_written > dunlink_head->records_written + deferred_unlink_delay)
|
|
flush_deferred_unlinks (false);
|
|
|
|
p = dunlink_alloc ();
|
|
p->next = NULL;
|
|
p->file_name = normalize_filename (name);
|
|
p->is_dir = is_dir;
|
|
p->records_written = records_written;
|
|
|
|
if (dunlink_tail)
|
|
dunlink_tail->next = p;
|
|
else
|
|
dunlink_head = p;
|
|
dunlink_tail = p;
|
|
dunlink_count++;
|
|
}
|