if (lchown(link, unix_data->uid, unix_data->gid)) {
if (errno == EPERM) {
/* Ignore */
- WARNING_WITH_ERRNO("failed to set symlink UNIX owner/group");
+ WARNING_WITH_ERRNO("failed to set symlink UNIX "
+ "owner/group on \"%s\"", link);
} else {
- ERROR_WITH_ERRNO("failed to set symlink UNIX owner/group");
+ ERROR_WITH_ERRNO("failed to set symlink UNIX "
+ "owner/group on \"%s\"", link);
return WIMLIB_ERR_INVALID_DENTRY;
}
}
}
static int
-fd_apply_unix_data(int fd, const struct wimlib_unix_data *unix_data)
+fd_apply_unix_data(int fd, const char *path,
+ const struct wimlib_unix_data *unix_data)
{
if (fchown(fd, unix_data->uid, unix_data->gid)) {
if (errno == EPERM) {
- WARNING_WITH_ERRNO("failed to set file UNIX owner/group");
+ WARNING_WITH_ERRNO("failed to set file UNIX "
+ "owner/group on \"%s\"", path);
/* Ignore? */
} else {
- ERROR_WITH_ERRNO("failed to set file UNIX owner/group");
+ ERROR_WITH_ERRNO("failed to set file UNIX "
+ "owner/group on \"%s\"", path);
return WIMLIB_ERR_INVALID_DENTRY;
}
}
if (fchmod(fd, unix_data->mode)) {
if (errno == EPERM) {
- WARNING_WITH_ERRNO("failed to set UNIX file mode");
+ WARNING_WITH_ERRNO("failed to set UNIX file mode "
+ "on \"%s\"", path);
/* Ignore? */
} else {
- ERROR_WITH_ERRNO("failed to set UNIX file mode");
+ ERROR_WITH_ERRNO("failed to set UNIX file mode "
+ "on \"%s\"", path);
return WIMLIB_ERR_INVALID_DENTRY;
}
}
int dfd = open(dir, O_RDONLY);
int ret;
if (dfd >= 0) {
- ret = fd_apply_unix_data(dfd, unix_data);
+ ret = fd_apply_unix_data(dfd, dir, unix_data);
if (close(dfd)) {
ERROR_WITH_ERRNO("can't close directory `%s'", dir);
ret = WIMLIB_ERR_MKDIR;
else if (ret < 0)
ret = 0;
else
- ret = fd_apply_unix_data(out_fd, &unix_data);
- if (ret != 0)
+ ret = fd_apply_unix_data(out_fd, output_path, &unix_data);
+ if (ret)
goto out;
}
if (lte)
{
char target[4096 + args->target_realpath_len];
char *fixed_target;
+ const struct wim_inode *inode = dentry->d_inode;
- ssize_t ret = inode_readlink(dentry->d_inode,
- target + args->target_realpath_len,
- sizeof(target) - args->target_realpath_len - 1,
- args->w, false);
+ ssize_t ret = wim_inode_readlink(inode,
+ target + args->target_realpath_len,
+ sizeof(target) - args->target_realpath_len - 1);
struct wim_lookup_table_entry *lte;
if (ret <= 0) {
if (target[args->target_realpath_len] == '/' &&
args->extract_flags & WIMLIB_EXTRACT_FLAG_RPFIX)
{
+ /* Fix absolute symbolic link target to point into the actual
+ * extraction destination */
memcpy(target, args->target_realpath,
args->target_realpath_len);
fixed_target = target;
} else {
+ /* Keep same link target */
fixed_target = target + args->target_realpath_len;
}
ret = symlink(fixed_target, output_path);
output_path, fixed_target);
return WIMLIB_ERR_LINK;
}
- lte = inode_unnamed_lte_resolved(dentry->d_inode);
- wimlib_assert(lte != NULL);
if (args->extract_flags & WIMLIB_EXTRACT_FLAG_UNIX_DATA) {
struct wimlib_unix_data unix_data;
- ret = inode_get_unix_data(dentry->d_inode, &unix_data, NULL);
+ ret = inode_get_unix_data(inode, &unix_data, NULL);
if (ret > 0)
;
else if (ret < 0)
if (ret)
return ret;
}
+ lte = inode_unnamed_lte_resolved(inode);
+ wimlib_assert(lte != NULL);
args->progress.extract.completed_bytes += wim_resource_size(lte);
return 0;
}
}
#ifndef __WIN32__
-static int unix_do_apply_dentry(const char *output_path,
- size_t output_path_len,
- struct wim_dentry *dentry,
- struct apply_args *args)
+static int
+unix_do_apply_dentry(const char *output_path, size_t output_path_len,
+ struct wim_dentry *dentry, struct apply_args *args)
{
const struct wim_inode *inode = dentry->d_inode;
apply_dentry_normal(struct wim_dentry *dentry, void *arg)
{
struct apply_args *args = arg;
- tchar *output_path;
size_t len;
+ tchar *output_path;
len = tstrlen(args->target);
if (dentry_is_root(dentry)) {
output_path[len] = T('\0');
}
-
#ifdef __WIN32__
return win32_do_apply_dentry_timestamps(output_path, len, dentry, args);
#else
#endif
}
-/* Extract a dentry if it hasn't already been extracted, and either the dentry
- * has no streams or WIMLIB_EXTRACT_FLAG_NO_STREAMS is not specified. */
+/* Extract a dentry if it hasn't already been extracted and either
+ * WIMLIB_EXTRACT_FLAG_NO_STREAMS is not specified, or the dentry is a directory
+ * and/or has no unnamed stream. */
static int
maybe_apply_dentry(struct wim_dentry *dentry, void *arg)
{
if (dentry->is_extracted)
return 0;
- if (args->extract_flags & WIMLIB_EXTRACT_FLAG_NO_STREAMS)
- if (inode_unnamed_lte_resolved(dentry->d_inode))
- return 0;
+ if (args->extract_flags & WIMLIB_EXTRACT_FLAG_NO_STREAMS &&
+ !dentry_is_directory(dentry) &&
+ inode_unnamed_lte_resolved(dentry->d_inode) != NULL)
+ return 0;
if ((args->extract_flags & WIMLIB_EXTRACT_FLAG_VERBOSE) &&
args->progress_func) {
list_add_tail(&inode->i_lte_inode_list, <e->inode_list);
inode_added = true;
}
-#ifdef WITH_NTFS_3G
- if (extract_flags & WIMLIB_EXTRACT_FLAG_NTFS) {
+
+ /* Determine whether to include alternate data stream entries or not.
+ *
+ * UNIX: Include them if extracting using NTFS-3g.
+ *
+ * Windows: Include them undconditionally, although if the filesystem is
+ * not NTFS we won't actually be able to extract them. */
+#if defined(WITH_NTFS_3G)
+ if (extract_flags & WIMLIB_EXTRACT_FLAG_NTFS)
+#elif defined(__WIN32__)
+ if (1)
+#else
+ if (0)
+#endif
+ {
for (unsigned i = 0; i < inode->i_num_ads; i++) {
if (inode->i_ads_entries[i].stream_name_nbytes != 0) {
lte = inode->i_ads_entries[i].lte;
}
}
}
-#endif
}
static void
/* Extract the dentry if it was not already
* extracted */
ret = maybe_apply_dentry(dentry, args);
- if (ret != 0)
+ if (ret)
return ret;
if (progress_func &&
args->progress.extract.completed_bytes >= next_progress)
struct apply_args args;
const struct apply_operations *ops;
- tchar *target_realpath;
memset(&args, 0, sizeof(args));
git://wimlib.net / wimlib / blobdiff