#include <quotearg.h>
#include <utimens.h>
#include <errno.h>
-#include <xgetcwd.h>
#include <priv-set.h>
#include "common.h"
char typeflag)
{
mode_t mode;
- bool failed;
-
+ int chmod_errno;
+
if (0 < same_permissions_option
&& permstatus != INTERDIR_PERMSTATUS)
{
mode = cur_info->st_mode ^ invert_permissions;
}
- failed = chmod (file_name, mode) != 0;
- if (failed && errno == EPERM)
+ chmod_errno = chmod (file_name, mode) == 0 ? 0 : errno;
+ if (chmod_errno == EPERM && (mode & S_ISUID) != 0)
{
- /* On Solaris, chmod may fail if we don't have PRIV_ALL. */
+ /* On Solaris, chmod may fail if we don't have PRIV_ALL, because
+ setuid-root files would otherwise be a backdoor. See
+ http://opensolaris.org/jive/thread.jspa?threadID=95826
+ (2009-09-03). */
if (priv_set_restore_linkdir () == 0)
{
- failed = chmod (file_name, mode) != 0;
+ chmod_errno = chmod (file_name, mode) == 0 ? 0 : errno;
priv_set_remove_linkdir ();
}
}
- if (failed)
- chmod_error_details (file_name, mode);
+ if (chmod_errno)
+ {
+ errno = chmod_errno;
+ chmod_error_details (file_name, mode);
+ }
}
/* Check time after successfully setting FILE_NAME's time stamp to T. */
properly restored on returning RECOVER_NO. */
static int
-maybe_recoverable (char *file_name, int *interdir_made)
+maybe_recoverable (char *file_name, bool *interdir_made)
{
int e = errno;
errno = ENOENT;
return RECOVER_NO;
}
- *interdir_made = 1;
+ *interdir_made = true;
return RECOVER_OK;
default:
{
int status;
mode_t mode;
- int interdir_made = 0;
+ bool interdir_made = false;
/* Save 'root device' to avoid purging mount points. */
if (one_file_system_option && root_device == 0)
{
struct stat st;
- char *dir = xgetcwd ();
- if (deref_stat (true, dir, &st))
- stat_diag (dir);
+ if (stat (".", &st) != 0)
+ stat_diag (".");
else
root_device = st.st_dev;
- free (dir);
}
if (incremental_option)
int status;
size_t count;
size_t written;
- int interdir_made = 0;
+ bool interdir_made = false;
mode_t mode = current_stat_info.stat.st_mode & MODE_RWX & ~ current_umask;
mode_t invert_permissions =
0 < same_owner_option ? mode & (S_IRWXG | S_IRWXO) : 0;
}
}
- mv_begin (¤t_stat_info);
+ mv_begin_read (¤t_stat_info);
if (current_stat_info.is_sparse)
sparse_extract_file (fd, ¤t_stat_info, &size);
else
process. */
static int
-create_placeholder_file (char *file_name, bool is_symlink, int *interdir_made)
+create_placeholder_file (char *file_name, bool is_symlink, bool *interdir_made)
{
int fd;
struct stat st;
{
case RECOVER_OK:
continue;
-
+
case RECOVER_SKIP:
return 0;
-
+
case RECOVER_NO:
open_error (file_name);
return -1;
static int
extract_link (char *file_name, int typeflag)
{
- int interdir_made = 0;
+ bool interdir_made = false;
char const *link_name;
int rc;
-
+
link_name = current_stat_info.link_name;
-
+
if (! absolute_names_option && contains_dot_dot (link_name))
return create_placeholder_file (file_name, false, &interdir_made);
extract_symlink (char *file_name, int typeflag)
{
#ifdef HAVE_SYMLINK
- int interdir_made = 0;
+ bool interdir_made = false;
if (! absolute_names_option
&& (IS_ABSOLUTE_FILE_NAME (current_stat_info.link_name)
{
case RECOVER_OK:
continue;
-
+
case RECOVER_SKIP:
return 0;
-
+
case RECOVER_NO:
symlink_error (current_stat_info.link_name, file_name);
return -1;
}
-
+
set_stat (file_name, ¤t_stat_info, NULL, 0, 0, SYMTYPE);
return 0;
static int
extract_node (char *file_name, int typeflag)
{
- int status;
- int interdir_made = 0;
+ bool interdir_made = false;
mode_t mode = current_stat_info.stat.st_mode & ~ current_umask;
mode_t invert_permissions =
0 < same_owner_option ? mode & (S_IRWXG | S_IRWXO) : 0;
{
case RECOVER_OK:
continue;
-
+
case RECOVER_SKIP:
return 0;
-
+
case RECOVER_NO:
mknod_error (file_name);
return -1;
set_stat (file_name, ¤t_stat_info, NULL, invert_permissions,
ARCHIVED_PERMSTATUS, typeflag);
- return status;
+ return 0;
}
#endif
extract_fifo (char *file_name, int typeflag)
{
int status;
- int interdir_made = 0;
+ bool interdir_made = false;
mode_t mode = current_stat_info.stat.st_mode & ~ current_umask;
mode_t invert_permissions =
0 < same_owner_option ? mode & (S_IRWXG | S_IRWXO) : 0;
{
case RECOVER_OK:
continue;
-
+
case RECOVER_SKIP:
return 0;
-
+
case RECOVER_NO:
mkfifo_error (file_name);
return -1;
tar_extractor_t fun;
fatal_exit_hook = extract_finish;
-
- /* Try to disable the ability to unlink a directory. */
- priv_set_remove_linkdir ();
set_next_block_after (current_header);
- decode_header (current_header, ¤t_stat_info, ¤t_format, 1);
+
if (!current_stat_info.file_name[0]
|| (interactive_option
&& !confirm ("extract", current_stat_info.file_name)))