const char *p2;
size_t i;
- num_path_components =
- get_num_path_components(dentry_full_path(dentry)) - 1;
- num_output_dir_path_components =
- get_num_path_components(args->target);
+ num_path_components = get_num_path_components(dentry->_full_path) - 1;
+ num_output_dir_path_components = get_num_path_components(args->target);
if (args->extract_flags & WIMLIB_EXTRACT_FLAG_MULTI_IMAGE) {
num_path_components++;
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;
}
ret = extract_wim_resource_to_fd(lte, out_fd, wim_resource_size(lte));
- if (ret != 0) {
+ if (ret) {
ERROR("Failed to extract resource to `%s'", output_path);
goto out;
}
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)
struct apply_args *args,
const char *output_path)
{
- char target[4096];
- ssize_t ret = inode_readlink(dentry->d_inode, target,
- sizeof(target), args->w, false);
+ char target[4096 + args->target_realpath_len];
+ char *fixed_target;
+ const struct wim_inode *inode = dentry->d_inode;
+
+ 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) {
ERROR("Could not read the symbolic link from dentry `%s'",
- dentry_full_path(dentry));
+ dentry->_full_path);
return WIMLIB_ERR_INVALID_DENTRY;
}
- ret = symlink(target, output_path);
- if (ret != 0) {
+ target[args->target_realpath_len + 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);
+ if (ret) {
ERROR_WITH_ERRNO("Failed to symlink `%s' to `%s'",
- output_path, target);
+ 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)
ret = 0;
else
ret = symlink_apply_unix_data(output_path, &unix_data);
- 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 = (tchar*)args->target;
} else {
- if (!dentry_full_path(dentry))
- return WIMLIB_ERR_NOMEM;
output_path = alloca(len * sizeof(tchar) + dentry->full_path_nbytes +
sizeof(tchar));
memcpy(output_path, args->target, len * sizeof(tchar));
if (dentry_is_root(dentry)) {
output_path = (tchar*)args->target;
} else {
- if (!dentry_full_path(dentry))
- return WIMLIB_ERR_NOMEM;
output_path = alloca(len * sizeof(tchar) + dentry->full_path_nbytes +
sizeof(tchar));
memcpy(output_path, args->target, len * sizeof(tchar));
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 (!dentry_full_path(dentry))
- return WIMLIB_ERR_NOMEM;
-
- 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) {
- args->progress.extract.cur_path = dentry_full_path(dentry);
+ args->progress.extract.cur_path = dentry->_full_path;
args->progress_func(WIMLIB_PROGRESS_MSG_EXTRACT_DENTRY,
&args->progress);
}
u64 num_streams = 0;
/* For each stream to be extracted... */
- list_for_each_entry(lte, stream_list, staging_list) {
+ list_for_each_entry(lte, stream_list, extraction_list) {
if (extract_flags &
(WIMLIB_EXTRACT_FLAG_SYMLINK | WIMLIB_EXTRACT_FLAG_HARDLINK))
{
{
if (++lte->out_refcnt == 1) {
INIT_LIST_HEAD(<e->inode_list);
- list_add_tail(<e->staging_list, stream_list);
+ list_add_tail(<e->extraction_list, stream_list);
}
}
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
-find_streams_for_extraction(struct hlist_head *inode_list,
+find_streams_for_extraction(struct wim_image_metadata *imd,
struct list_head *stream_list,
struct wim_lookup_table *lookup_table,
int extract_flags)
{
struct wim_inode *inode;
- struct hlist_node *cur;
struct wim_dentry *dentry;
for_lookup_table_entry(lookup_table, lte_zero_out_refcnt, NULL);
INIT_LIST_HEAD(stream_list);
- hlist_for_each_entry(inode, cur, inode_list, i_hlist) {
+ image_for_each_inode(inode, imd) {
if (!inode->i_resolved)
inode_resolve_ltes(inode, lookup_table);
inode_for_each_dentry(dentry, inode)
* sequential reading of the WIM can be implemented. */
/* For each distinct stream to be extracted */
- list_for_each_entry(lte, stream_list, staging_list) {
+ list_for_each_entry(lte, stream_list, extraction_list) {
/* For each inode that contains the stream */
list_for_each_entry(inode, <e->inode_list, i_lte_inode_list) {
/* For each dentry that points to the inode */
/* 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)
return 0;
}
+static int
+sort_stream_list_by_wim_position(struct list_head *stream_list)
+{
+ struct list_head *cur;
+ size_t num_streams;
+ struct wim_lookup_table_entry **array;
+ size_t i;
+ size_t array_size;
+
+ num_streams = 0;
+ list_for_each(cur, stream_list)
+ num_streams++;
+ array_size = num_streams * sizeof(array[0]);
+ array = MALLOC(array_size);
+ if (!array) {
+ ERROR("Failed to allocate %zu bytes to sort stream entries",
+ array_size);
+ return WIMLIB_ERR_NOMEM;
+ }
+ cur = stream_list->next;
+ for (i = 0; i < num_streams; i++) {
+ array[i] = container_of(cur, struct wim_lookup_table_entry, extraction_list);
+ cur = cur->next;
+ }
+
+ qsort(array, num_streams, sizeof(array[0]), cmp_streams_by_wim_position);
+
+ INIT_LIST_HEAD(stream_list);
+ for (i = 0; i < num_streams; i++)
+ list_add_tail(&array[i]->extraction_list, stream_list);
+ FREE(array);
+ return 0;
+}
+
+
/* Extracts the image @image from the WIM @w to the directory or NTFS volume
* @target. */
static int
{
int ret;
struct list_head stream_list;
- struct hlist_head *inode_list;
struct apply_args args;
const struct apply_operations *ops;
if (ret)
goto out;
- inode_list = &wim_get_current_image_metadata(w)->inode_list;
-
/* Build a list of the streams that need to be extracted */
- find_streams_for_extraction(inode_list, &stream_list,
+ find_streams_for_extraction(wim_get_current_image_metadata(w),
+ &stream_list,
w->lookup_table, extract_flags);
/* Calculate the number of bytes of data that will be extracted */
&args.progress);
}
+ ret = calculate_dentry_tree_full_paths(wim_root_dentry(w));
+ if (ret)
+ goto out;
+
/* Make the directory structure and extract empty files */
args.extract_flags |= WIMLIB_EXTRACT_FLAG_NO_STREAMS;
args.apply_dentry = ops->apply_dentry;
ret = for_dentry_in_tree(wim_root_dentry(w), maybe_apply_dentry, &args);
args.extract_flags &= ~WIMLIB_EXTRACT_FLAG_NO_STREAMS;
- if (ret != 0)
+ if (ret)
goto out;
if (progress_func) {
&args.progress);
}
+ if (extract_flags & WIMLIB_EXTRACT_FLAG_RPFIX) {
+ args.target_realpath = realpath(target, NULL);
+ if (!args.target_realpath)
+ return WIMLIB_ERR_NOMEM;
+ args.target_realpath_len = tstrlen(args.target_realpath);
+ }
+
/* Extract non-empty files */
ret = apply_stream_list(&stream_list, &args, ops, progress_func);
- if (ret != 0)
- goto out;
+ if (ret)
+ goto out_free_target_realpath;
if (progress_func) {
progress_func(WIMLIB_PROGRESS_MSG_APPLY_TIMESTAMPS,
/* Apply timestamps */
ret = for_dentry_in_tree_depth(wim_root_dentry(w),
ops->apply_dentry_timestamps, &args);
- if (ret != 0)
- goto out;
+ if (ret)
+ goto out_free_target_realpath;
if (progress_func) {
progress_func(WIMLIB_PROGRESS_MSG_EXTRACT_IMAGE_END,
&args.progress);
}
+out_free_target_realpath:
+ FREE(args.target_realpath);
out:
#ifdef WITH_NTFS_3G
/* Unmount the NTFS volume */
return ret;
}
-static const tchar *filename_forbidden_chars =
+static const tchar * const filename_forbidden_chars =
T(
#ifdef __WIN32__
"<>:\"/\\|?*"
#endif
}
+ if ((extract_flags & (WIMLIB_EXTRACT_FLAG_RPFIX |
+ WIMLIB_EXTRACT_FLAG_RPFIX)) ==
+ (WIMLIB_EXTRACT_FLAG_RPFIX | WIMLIB_EXTRACT_FLAG_NORPFIX))
+ {
+ ERROR("Cannot specify RPFIX and NORPFIX flags at the same time!");
+ return WIMLIB_ERR_INVALID_PARAM;
+ }
+
+ if ((extract_flags & (WIMLIB_EXTRACT_FLAG_RPFIX |
+ WIMLIB_EXTRACT_FLAG_NORPFIX)) == 0)
+ if (w->hdr.flags & WIM_HDR_FLAG_RP_FIX)
+ extract_flags |= WIMLIB_EXTRACT_FLAG_RPFIX;
+
ret = verify_swm_set(w, additional_swms, num_additional_swms);
- if (ret != 0)
+ if (ret)
+ return ret;
+
+ ret = wim_checksum_unhashed_streams(w);
+ if (ret)
return ret;
if (num_additional_swms) {
ret = new_joined_lookup_table(w, additional_swms,
num_additional_swms, &joined_tab);
- if (ret != 0)
+ if (ret)
return ret;
w_tab_save = w->lookup_table;
w->lookup_table = joined_tab;
git://wimlib.net / wimlib / blobdiff