X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=inline;f=src%2Fextract.c;h=dad7746e0a702cc960ebc953358258f617ce2ed1;hb=57b11473b0135b1e092cf045f94635c934c7c63f;hp=7ce9ce863f188f3c8babb83e3eb829d05ab83820;hpb=ab6dd4948d1736b97a343d3c183f2dedad7421bb;p=chaz%2Ftar diff --git a/src/extract.c b/src/extract.c index 7ce9ce8..dad7746 100644 --- a/src/extract.c +++ b/src/extract.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include "common.h" @@ -81,10 +80,12 @@ struct delayed_link /* The next delayed link in the list. */ struct delayed_link *next; - /* The device, inode number and last-modified time of the placeholder. */ + /* The device, inode number and ctime of the placeholder. Use + ctime, not mtime, to make false matches less likely if some + other process removes the placeholder. */ dev_t dev; ino_t ino; - struct timespec mtime; + struct timespec ctime; /* True if the link is symbolic. */ bool is_symlink; @@ -145,7 +146,7 @@ set_mode (char const *file_name, char typeflag) { mode_t mode; - bool failed; + int chmod_errno; if (0 < same_permissions_option && permstatus != INTERDIR_PERMSTATUS) @@ -188,18 +189,24 @@ set_mode (char const *file_name, 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. */ @@ -516,7 +523,7 @@ file_newer_p (const char *file_name, struct tar_stat_info *tar_stat) 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; @@ -561,7 +568,7 @@ maybe_recoverable (char *file_name, int *interdir_made) errno = ENOENT; return RECOVER_NO; } - *interdir_made = 1; + *interdir_made = true; return RECOVER_OK; default: @@ -642,19 +649,17 @@ extract_dir (char *file_name, int typeflag) { 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) @@ -775,7 +780,7 @@ extract_file (char *file_name, int typeflag) 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; @@ -882,7 +887,7 @@ extract_file (char *file_name, int typeflag) 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; @@ -921,7 +926,7 @@ create_placeholder_file (char *file_name, bool is_symlink, int *interdir_made) delayed_link_head = p; p->dev = st.st_dev; p->ino = st.st_ino; - p->mtime = get_stat_mtime (&st); + p->ctime = get_stat_ctime (&st); p->is_symlink = is_symlink; if (is_symlink) { @@ -964,7 +969,7 @@ create_placeholder_file (char *file_name, bool is_symlink, int *interdir_made) static int extract_link (char *file_name, int typeflag) { - int interdir_made = 0; + bool interdir_made = false; char const *link_name; int rc; @@ -987,7 +992,7 @@ extract_link (char *file_name, int typeflag) for (; ds; ds = ds->next) if (ds->dev == st1.st_dev && ds->ino == st1.st_ino - && timespec_cmp (ds->mtime, get_stat_mtime (&st1)) == 0) + && timespec_cmp (ds->ctime, get_stat_ctime (&st1)) == 0) { struct string_list *p = xmalloc (offsetof (struct string_list, string) + strlen (file_name) + 1); @@ -1023,7 +1028,7 @@ static int 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) @@ -1065,7 +1070,7 @@ extract_symlink (char *file_name, int typeflag) static int extract_node (char *file_name, int typeflag) { - 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; @@ -1096,7 +1101,7 @@ static int 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; @@ -1274,9 +1279,6 @@ extract_archive (void) fatal_exit_hook = extract_finish; - /* Try to disable the ability to unlink a directory. */ - priv_set_remove_linkdir (); - set_next_block_after (current_header); if (!current_stat_info.file_name[0] @@ -1347,7 +1349,7 @@ apply_delayed_links (void) if (lstat (source, &st) == 0 && st.st_dev == ds->dev && st.st_ino == ds->ino - && timespec_cmp (get_stat_mtime (&st), ds->mtime) == 0) + && timespec_cmp (get_stat_ctime (&st), ds->ctime) == 0) { /* Unlink the placeholder, then create a hard link if possible, a symbolic link otherwise. */