2005-05-14 Paul Eggert <eggert@cs.ucla.edu>
+ Port to Solaris 10's treatment of unlinking directories.
+ * gnulib-modules: Add unlinkdir.
+ * lib/.cvsignore: Add unlinkdir.h, unlinkdir.c.
+ * src/common.h (we_are_root): Remove extern decl; it's now static.
+ * src/extract.c (we_are_root): Now static.
+ * src/misc.c: Include <unlinkdir.h>.
+ (remove_any_file): Use cannot_unlink_dir () rather than we_are_root.
+
* ChangeLog, ChangeLog.1, Makefile.am, NEWS, PORTS, README,
README-alpha, TODO, bootstrap, configure.ac, doc/Makefile.am,
doc/convtexi.pl, doc/fdl.texi, doc/gendocs_template,
#include "common.h"
-bool 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) */
FIXME: Should the same be done after handling -C option ? */
if (one_file_system_option)
{
- struct stat st;
+ struct stat st;
char *dir = xgetcwd ();
if (deref_stat (true, dir, &st))
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. */
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);
}
errno = EEXIST;
}
-
+
if (maybe_recoverable (file_name, &interdir_made))
continue;
-
+
if (errno != EEXIST)
{
mkdir_error (file_name);
}
break;
}
-
+
if (status == 0
|| old_files_option == DEFAULT_OLD_FILES
|| old_files_option == OVERWRITE_OLD_FILES)
fd = open (file_name, openflag, mode);
#endif /* not O_CTG */
-
+
return fd;
}
size_t count;
size_t written;
int interdir_made = 0;
-
+
/* FIXME: deal with protection issues. */
if (to_stdout_option)
do
fd = open_output_file (file_name, typeflag);
while (fd < 0 && maybe_recoverable (file_name, &interdir_made));
-
+
if (fd < 0)
{
open_error (file_name);
return 1;
}
}
-
+
if (current_stat_info.is_sparse)
sparse_extract_file (fd, ¤t_stat_info, &size);
else
/* 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)
{
}
written = available_space_after (data_block);
-
+
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)
break;
}
}
-
+
skip_file (size);
if (multi_volume_option)
typeflag);
return status;
-}
+}
static int
extract_link (char *file_name, int typeflag)
{
char const *link_name = safer_name_suffix (current_stat_info.link_name, true);
int interdir_made = 0;
-
+
do
{
struct stat st1, st2;
&& st1.st_dev == st2.st_dev
&& st1.st_ino == st2.st_ino))
return 0;
-
+
errno = e;
}
while (maybe_recoverable (file_name, &interdir_made));
return 1;
}
return 0;
-}
+}
static int
extract_symlink (char *file_name, int typeflag)
#ifdef HAVE_SYMLINK
int status, fd;
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)))
do
{
h->after_symlinks = 1;
-
+
if (stat (h->file_name, &st) != 0)
stat_error (h->file_name);
else
}
while ((h = h->next) && ! h->after_symlinks);
}
-
+
status = 0;
}
}
warned_once = 1;
WARN ((0, 0, _("Attempting extraction of symbolic links as hard links")));
}
- return extract_link (file_name, typeflag);
+ return extract_link (file_name, typeflag);
#endif
-}
+}
#if S_IFCHR || S_IFBLK
static int
{
int status;
int interdir_made = 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));
-
+
if (status != 0)
mknod_error (file_name);
else
{
int status;
int interdir_made = 0;
-
+
while ((status = mkfifo (file_name, current_stat_info.stat.st_mode)))
if (!maybe_recoverable (file_name, &interdir_made))
break;
else
mkfifo_error (file_name);
return status;
-}
+}
#endif
static int
return 0;
}
-
+
static int
extract_failure (char *file_name, int typeflag)
{
prepare_to_extract (char const *file_name, int typeflag, tar_extractor_t *fun)
{
int rc = 1;
-
+
if (EXTRACT_OVER_PIPE)
rc = 0;
*fun = extract_file;
rc = 1;
break;
-
+
case AREGTYPE:
case REGTYPE:
case CONTTYPE:
/* 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
+ if (!remove_any_file (file_name,
+ recursive_unlink_option ? RECURSIVE_REMOVE_OPTION
: ORDINARY_REMOVE_OPTION)
&& errno && errno != ENOENT)
{
char typeflag;
char *file_name;
tar_extractor_t fun;
-
+
set_next_block_after (current_header);
decode_header (current_header, ¤t_stat_info, ¤t_format, 1);
}
else
skip_member ();
-
+
}
/* Extract the symbolic links whose final extraction were delayed. */
#include "common.h"
#include <quotearg.h>
#include <save-cwd.h>
+#include <unlinkdir.h>
static void call_arg_fatal (char const *, char const *)
__attribute__ ((noreturn));
*destination++ = '\a';
source++;
break;
-
+
case 'b':
*destination++ = '\b';
source++;
*destination++ = '\v';
source++;
break;
-
+
case '?':
*destination++ = 0177;
source++;
for (;;)
if (ISSLASH (file_name[1]))
file_name++;
- else if (file_name[1] == '.'
+ else if (file_name[1] == '.'
&& ISSLASH (file_name[2 + (file_name[2] == '.')]))
file_name += 2 + (file_name[2] == '.');
else
return rmdir (file_name);
}
-/* Remove FILE_NAME, returning 1 on success. If FILE_NAME is a directory,
+/* Remove FILE_NAME, returning 1 on success. If FILE_NAME is a directory,
then if OPTION is RECURSIVE_REMOVE_OPTION is set remove FILE_NAME
recursively; otherwise, remove it only if it is empty. If FILE_NAME is
a directory that cannot be removed (e.g., because it is nonempty)
int
remove_any_file (const char *file_name, enum remove_option option)
{
- /* Try unlink first if we are not root, as this saves us a system
- call in the common case where we're removing a non-directory. */
- if (! we_are_root)
+ /* Try unlink first if we cannot unlink directories, as this saves
+ us a system call in the common case where we're removing a
+ non-directory. */
+ if (cannot_unlink_dir ())
{
if (unlink (file_name) == 0)
return 1;
switch (errno)
{
case ENOTDIR:
- return we_are_root && unlink (file_name) == 0;
+ return cannot_unlink_dir () && unlink (file_name) == 0;
case 0:
case EEXIST:
entry += entrylen + 1)
{
char *file_name_buffer = new_name (file_name, entry);
- int r = remove_any_file (file_name_buffer,
+ int r = remove_any_file (file_name_buffer,
RECURSIVE_REMOVE_OPTION);
int e = errno;
free (file_name_buffer);
projects / chaz / tar / commitdiff
