X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fextract.c;h=a3942cf758109b20862612f866c9a1cadf1c3d4b;hp=da637d2e55593345e06a1cc908d40511a9111b27;hb=3cf06a471de65b5e69b44c41b95b1bbfb49ab55f;hpb=150fd376ac944f0fdc22c0df7beaa8dbd076061c diff --git a/src/extract.c b/src/extract.c index da637d2e..a3942cf7 100644 --- a/src/extract.c +++ b/src/extract.c @@ -2,6 +2,11 @@ * extract.c * * Support for extracting WIM files. + * + * This code does NOT contain any filesystem-specific features. In particular, + * security information (i.e. file permissions) and alternate data streams are + * ignored, except possibly to read an alternate data stream that contains + * symbolic link data. */ /* @@ -11,29 +16,37 @@ * This file is part of wimlib, a library for working with WIM files. * * wimlib is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) + * terms of the GNU General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) * any later version. * * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * A PARTICULAR PURPOSE. See the GNU General Public License for more * details. * - * You should have received a copy of the GNU Lesser General Public License + * You should have received a copy of the GNU General Public License * along with wimlib; if not, see http://www.gnu.org/licenses/. */ +#include "config.h" + #include #include #include #include #include +#include #include + +#ifdef HAVE_UTIME_H +#include +#endif + + #include -#include "config.h" #include "dentry.h" #include "lookup_table.h" #include "timestamp.h" @@ -42,17 +55,11 @@ #ifdef WITH_NTFS_3G #include -#include #endif - -/* Internal */ -#define WIMLIB_EXTRACT_FLAG_MULTI_IMAGE 0x80000000 - -static int extract_regular_file_linked(const struct dentry *dentry, - const char *output_dir, +static int extract_regular_file_linked(struct dentry *dentry, const char *output_path, - int extract_flags, + struct apply_args *args, struct lookup_table_entry *lte) { /* This mode overrides the normal hard-link extraction and @@ -60,38 +67,33 @@ static int extract_regular_file_linked(const struct dentry *dentry, * the WIM, even if they are in a different image (in the case * of a multi-image extraction) */ - wimlib_assert(lte->file_on_disk); - - - if (extract_flags & WIMLIB_EXTRACT_FLAG_HARDLINK) { - if (link(lte->file_on_disk, output_path) != 0) { + if (args->extract_flags & WIMLIB_EXTRACT_FLAG_HARDLINK) { + if (link(lte->extracted_file, output_path) != 0) { ERROR_WITH_ERRNO("Failed to hard link " "`%s' to `%s'", - output_path, lte->file_on_disk); + output_path, lte->extracted_file); return WIMLIB_ERR_LINK; } } else { int num_path_components; int num_output_dir_path_components; - size_t file_on_disk_len; + size_t extracted_file_len; char *p; const char *p2; size_t i; - wimlib_assert(extract_flags & WIMLIB_EXTRACT_FLAG_SYMLINK); - - num_path_components = + num_path_components = get_num_path_components(dentry->full_path_utf8) - 1; num_output_dir_path_components = - get_num_path_components(output_dir); + get_num_path_components(args->target); - if (extract_flags & WIMLIB_EXTRACT_FLAG_MULTI_IMAGE) { + if (args->extract_flags & WIMLIB_EXTRACT_FLAG_MULTI_IMAGE) { num_path_components++; num_output_dir_path_components--; } - file_on_disk_len = strlen(lte->file_on_disk); + extracted_file_len = strlen(lte->extracted_file); - char buf[file_on_disk_len + 3 * num_path_components + 1]; + char buf[extracted_file_len + 3 * num_path_components + 1]; p = &buf[0]; for (i = 0; i < num_path_components; i++) { @@ -99,7 +101,7 @@ static int extract_regular_file_linked(const struct dentry *dentry, *p++ = '.'; *p++ = '/'; } - p2 = lte->file_on_disk; + p2 = lte->extracted_file; while (*p2 == '/') p2++; while (num_output_dir_path_components--) @@ -108,55 +110,54 @@ static int extract_regular_file_linked(const struct dentry *dentry, if (symlink(buf, output_path) != 0) { ERROR_WITH_ERRNO("Failed to symlink `%s' to " "`%s'", - buf, lte->file_on_disk); + buf, lte->extracted_file); return WIMLIB_ERR_LINK; } - } return 0; } -static int extract_regular_file_unlinked(WIMStruct *w, - struct dentry *dentry, +static int extract_regular_file_unlinked(struct dentry *dentry, + struct apply_args *args, const char *output_path, - int extract_flags, struct lookup_table_entry *lte) { /* Normal mode of extraction. Regular files and hard links are * extracted in the way that they appear in the WIM. */ int out_fd; - const struct resource_entry *res_entry; int ret; - const struct list_head *head = &dentry->link_group_list; - - if (head->next != head) { - /* This dentry is one of a hard link set of at least 2 dentries. - * If one of the other dentries has already been extracted, make - * a hard link to the file corresponding to this - * already-extracted directory. Otherwise, extract the - * file, and set the dentry->extracted_file field so that other + struct inode *inode = dentry->d_inode; + + if (!((args->extract_flags & WIMLIB_EXTRACT_FLAG_MULTI_IMAGE) + && (args->extract_flags & (WIMLIB_EXTRACT_FLAG_SYMLINK | + WIMLIB_EXTRACT_FLAG_HARDLINK)))) + { + /* If the dentry is one of a hard link set of at least 2 + * dentries and one of the other dentries has already been + * extracted, make a hard link to the file corresponding to this + * already-extracted directory. Otherwise, extract the file, + * and set the inode->extracted_file field so that other * dentries in the hard link group can link to it. */ - struct dentry *other; - list_for_each_entry(other, head, link_group_list) { - if (other->extracted_file) { + if (inode->link_count > 1) { + if (inode->extracted_file) { DEBUG("Extracting hard link `%s' => `%s'", - output_path, other->extracted_file); - if (link(other->extracted_file, output_path) != 0) { + output_path, inode->extracted_file); + if (link(inode->extracted_file, output_path) != 0) { ERROR_WITH_ERRNO("Failed to hard link " "`%s' to `%s'", output_path, - other->extracted_file); + inode->extracted_file); return WIMLIB_ERR_LINK; } return 0; } - } - FREE(dentry->extracted_file); - dentry->extracted_file = STRDUP(output_path); - if (!dentry->extracted_file) { - ERROR("Failed to allocate memory for filename"); - return WIMLIB_ERR_NOMEM; + FREE(inode->extracted_file); + inode->extracted_file = STRDUP(output_path); + if (!inode->extracted_file) { + ERROR("Failed to allocate memory for filename"); + return WIMLIB_ERR_NOMEM; + } } } @@ -173,30 +174,16 @@ static int extract_regular_file_unlinked(WIMStruct *w, /* Empty file with no lookup table entry */ DEBUG("Empty file `%s'.", output_path); ret = 0; - goto done; + goto out; } - - res_entry = <e->resource_entry; - - ret = extract_resource_to_fd(w, res_entry, out_fd, - res_entry->original_size); - + ret = extract_full_wim_resource_to_fd(lte, out_fd); if (ret != 0) { ERROR("Failed to extract resource to `%s'", output_path); - goto done; - } - - if (extract_flags & WIMLIB_EXTRACT_FLAG_MULTI_IMAGE) { - /* Mark the lookup table entry to indicate this file has been - * extracted. */ - lte->out_refcnt++; - FREE(lte->file_on_disk); - lte->file_on_disk = STRDUP(output_path); - if (!lte->file_on_disk) - ret = WIMLIB_ERR_NOMEM; + goto out; } -done: + args->progress.extract.completed_bytes += wim_resource_size(lte); +out: if (close(out_fd) != 0) { ERROR_WITH_ERRNO("Failed to close file `%s'", output_path); ret = WIMLIB_ERR_WRITE; @@ -204,40 +191,41 @@ done: return ret; } -/* - * Extracts a regular file from the WIM archive. +/* + * Extracts a regular file from the WIM archive. */ -static int extract_regular_file(WIMStruct *w, - struct dentry *dentry, - const char *output_dir, - const char *output_path, - int extract_flags) +static int extract_regular_file(struct dentry *dentry, + struct apply_args *args, + const char *output_path) { struct lookup_table_entry *lte; + const struct inode *inode = dentry->d_inode; - lte = dentry_first_lte(dentry, w->lookup_table); + lte = inode_unnamed_lte_resolved(inode); - if ((extract_flags & (WIMLIB_EXTRACT_FLAG_SYMLINK | - WIMLIB_EXTRACT_FLAG_HARDLINK)) && lte) { - if (lte->out_refcnt++ != 0) - return extract_regular_file_linked(dentry, output_dir, - output_path, - extract_flags, lte); - lte->file_on_disk = STRDUP(output_path); - if (!lte->file_on_disk) - return WIMLIB_ERR_NOMEM; + if (lte && (args->extract_flags & (WIMLIB_EXTRACT_FLAG_SYMLINK | + WIMLIB_EXTRACT_FLAG_HARDLINK))) + { + if (lte->extracted_file) { + return extract_regular_file_linked(dentry, output_path, args, lte); + } else { + lte->extracted_file = STRDUP(output_path); + if (!lte->extracted_file) + return WIMLIB_ERR_NOMEM; + } } - - return extract_regular_file_unlinked(w, dentry, output_path, - extract_flags, lte); - + return extract_regular_file_unlinked(dentry, args, output_path, lte); } -static int extract_symlink(const struct dentry *dentry, const char *output_path, - const WIMStruct *w) +static int extract_symlink(struct dentry *dentry, + struct apply_args *args, + const char *output_path) { char target[4096]; - ssize_t ret = dentry_readlink(dentry, target, sizeof(target), w); + ssize_t ret = inode_readlink(dentry->d_inode, target, + sizeof(target), args->w, 0); + struct lookup_table_entry *lte; + if (ret <= 0) { ERROR("Could not read the symbolic link from dentry `%s'", dentry->full_path_utf8); @@ -249,15 +237,17 @@ static int extract_symlink(const struct dentry *dentry, const char *output_path, output_path, target); return WIMLIB_ERR_LINK; } + lte = inode_unnamed_lte_resolved(dentry->d_inode); + args->progress.extract.completed_bytes += wim_resource_size(lte); return 0; } -/* - * Extracts a directory from the WIM archive. +/* + * Extracts a directory from the WIM archive. * * @dentry: The directory entry for the directory. * @output_path: The path to which the directory is to be extracted to. - * @return: True on success, false on failure. + * @return: True on success, false on failure. */ static int extract_directory(const char *output_path, bool is_root) { @@ -266,8 +256,8 @@ static int extract_directory(const char *output_path, bool is_root) ret = stat(output_path, &stbuf); if (ret == 0) { if (S_ISDIR(stbuf.st_mode)) { - if (!is_root) - WARNING("`%s' already exists", output_path); + /*if (!is_root)*/ + /*WARNING("`%s' already exists", output_path);*/ return 0; } else { ERROR("`%s' is not a directory", output_path); @@ -289,194 +279,507 @@ static int extract_directory(const char *output_path, bool is_root) return 0; } -struct extract_args { - WIMStruct *w; - int extract_flags; - const char *output_dir; -#ifdef WITH_NTFS_3G - struct SECURITY_API *scapi; -#endif -}; - -/* +/* * Extracts a file, directory, or symbolic link from the WIM archive. For use * in for_dentry_in_tree(). */ -static int extract_dentry(struct dentry *dentry, void *arg) +static int apply_dentry_normal(struct dentry *dentry, void *arg) { - struct extract_args *args = arg; - WIMStruct *w = args->w; + struct apply_args *args = arg; int extract_flags = args->extract_flags; - size_t len = strlen(args->output_dir); - char output_path[len + dentry->full_path_utf8_len + 1]; + struct inode *inode = dentry->d_inode; + size_t len; int ret; - if (extract_flags & WIMLIB_EXTRACT_FLAG_VERBOSE) { - wimlib_assert(dentry->full_path_utf8); - puts(dentry->full_path_utf8); + if (dentry->is_extracted) + return 0; + + if (extract_flags & WIMLIB_EXTRACT_FLAG_NO_STREAMS) + if (inode_unnamed_lte_resolved(inode)) + return 0; + + if ((extract_flags & WIMLIB_EXTRACT_FLAG_VERBOSE) && + args->progress_func) + { + args->progress.extract.cur_path = dentry->full_path_utf8; + args->progress_func(WIMLIB_PROGRESS_MSG_EXTRACT_DENTRY, + &args->progress); } - memcpy(output_path, args->output_dir, len); + len = strlen(args->target); + char output_path[len + dentry->full_path_utf8_len + 1]; + memcpy(output_path, args->target, len); memcpy(output_path + len, dentry->full_path_utf8, dentry->full_path_utf8_len); output_path[len + dentry->full_path_utf8_len] = '\0'; - if (dentry_is_symlink(dentry)) - ret = extract_symlink(dentry, output_path, w); - else if (dentry_is_directory(dentry)) - ret = extract_directory(output_path, dentry_is_root(dentry)); + if (inode_is_symlink(inode)) + ret = extract_symlink(dentry, args, output_path); + else if (inode_is_directory(inode)) + ret = extract_directory(output_path, false); else - ret = extract_regular_file(w, dentry, args->output_dir, - output_path, extract_flags); - if (ret != 0) - return ret; - - return 0; + ret = extract_regular_file(dentry, args, output_path); + if (ret == 0) + dentry->is_extracted = 1; + return ret; } -static int apply_dentry_timestamps(struct dentry *dentry, void *arg) +/* Apply timestamp to extracted file */ +static int apply_dentry_timestamps_normal(struct dentry *dentry, void *arg) { - struct extract_args *args = arg; - size_t len = strlen(args->output_dir); + struct apply_args *args = arg; + size_t len = strlen(args->target); char output_path[len + dentry->full_path_utf8_len + 1]; + const struct inode *inode = dentry->d_inode; + int ret; - memcpy(output_path, args->output_dir, len); + memcpy(output_path, args->target, len); memcpy(output_path + len, dentry->full_path_utf8, dentry->full_path_utf8_len); output_path[len + dentry->full_path_utf8_len] = '\0'; struct timeval tv[2]; - wim_timestamp_to_timeval(dentry->last_access_time, &tv[0]); - wim_timestamp_to_timeval(dentry->last_write_time, &tv[1]); - if (lutimes(output_path, tv) != 0) { - WARNING("Failed to set timestamp on file `%s': %s", - output_path, strerror(errno)); + wim_timestamp_to_timeval(inode->last_access_time, &tv[0]); + wim_timestamp_to_timeval(inode->last_write_time, &tv[1]); + #ifdef HAVE_LUTIMES + ret = lutimes(output_path, tv); + #else + ret = -1; + errno = ENOSYS; + #endif + if (ret != 0) { + #ifdef HAVE_UTIME + if (errno == ENOSYS) { + struct utimbuf buf; + buf.actime = wim_timestamp_to_unix(inode->last_access_time); + buf.modtime = wim_timestamp_to_unix(inode->last_write_time); + if (utime(output_path, &buf) == 0) + return 0; + } + #endif + if (errno != ENOSYS || args->num_lutimes_warnings < 10) { + /*WARNING("Failed to set timestamp on file `%s': %s",*/ + /*output_path, strerror(errno));*/ + args->num_lutimes_warnings++; + } } return 0; } +static int cmp_streams_by_wim_position(const void *p1, const void *p2) +{ + const struct lookup_table_entry *lte1, *lte2; + lte1 = *(const struct lookup_table_entry**)p1; + lte2 = *(const struct lookup_table_entry**)p2; + if (lte1->resource_entry.offset < lte2->resource_entry.offset) + return -1; + else if (lte1->resource_entry.offset > lte2->resource_entry.offset) + return 1; + else + return 0; +} -static int extract_single_image(WIMStruct *w, int image, - const char *output_dir, int extract_flags) +static int sort_stream_list_by_wim_position(struct list_head *stream_list) +{ + struct list_head *cur; + size_t num_streams; + struct 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 lookup_table_entry, staging_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]->staging_list, stream_list); + FREE(array); + return 0; +} + +static void calculate_bytes_to_extract(struct list_head *stream_list, + int extract_flags, + union wimlib_progress_info *progress) +{ + struct lookup_table_entry *lte; + struct inode *inode; + u64 total_bytes = 0; + u64 num_streams = 0; + + /* For each stream to be extracted... */ + list_for_each_entry(lte, stream_list, staging_list) { + if (extract_flags & + (WIMLIB_EXTRACT_FLAG_SYMLINK | WIMLIB_EXTRACT_FLAG_HARDLINK)) + { + /* In the symlink or hard link extraction mode, each + * stream will be extracted one time regardless of how + * many dentries share the stream. */ + wimlib_assert(!(extract_flags & WIMLIB_EXTRACT_FLAG_NTFS)); + if (!lte->extracted_file) { + num_streams++; + total_bytes += wim_resource_size(lte); + } + } else { + list_for_each_entry(inode, <e->inode_list, + lte_inode_list) + { + num_streams++; + total_bytes += wim_resource_size(lte); + } + } + } + progress->extract.num_streams = num_streams; + progress->extract.total_bytes = total_bytes; + progress->extract.completed_bytes = 0; +} + +static void maybe_add_stream_for_extraction(struct lookup_table_entry *lte, + struct list_head *stream_list) +{ + if (lte->out_refcnt == 0) { + lte->out_refcnt = 1; + INIT_LIST_HEAD(<e->inode_list); + list_add_tail(<e->staging_list, stream_list); + } +} + +static void inode_find_streams_for_extraction(struct inode *inode, + struct list_head *stream_list, + int extract_flags) +{ + struct lookup_table_entry *lte; + bool inode_added = false; + + lte = inode_unnamed_lte_resolved(inode); + + if (lte) { + maybe_add_stream_for_extraction(lte, stream_list); + list_add_tail(&inode->lte_inode_list, <e->inode_list); + inode_added = true; + } +#ifdef WITH_NTFS_3G + if (extract_flags & WIMLIB_EXTRACT_FLAG_NTFS) { + for (unsigned i = 0; i < inode->num_ads; i++) { + if (inode->ads_entries[i].stream_name_len != 0) { + lte = inode_stream_lte_resolved(inode, i + 1); + if (lte) { + maybe_add_stream_for_extraction(lte, + stream_list); + if (!inode_added) { + list_add_tail(&inode->lte_inode_list, + <e->inode_list); + inode_added = true; + } + } + } + } + } +#endif +} + +static void find_streams_for_extraction(struct hlist_head *inode_list, + struct list_head *stream_list, + struct lookup_table *lookup_table, + int extract_flags) +{ + struct inode *inode; + struct hlist_node *cur; + struct 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, hlist) { + if (!inode->resolved) + inode_resolve_ltes(inode, lookup_table); + inode_for_each_dentry(dentry, inode) + dentry->is_extracted = 0; + inode_find_streams_for_extraction(inode, stream_list, + extract_flags); + } +} + +struct apply_operations { + int (*apply_dentry)(struct dentry *dentry, void *arg); + int (*apply_dentry_timestamps)(struct dentry *dentry, void *arg); +}; + +static const struct apply_operations normal_apply_operations = { + .apply_dentry = apply_dentry_normal, + .apply_dentry_timestamps = apply_dentry_timestamps_normal, +}; + +#ifdef WITH_NTFS_3G +static const struct apply_operations ntfs_apply_operations = { + .apply_dentry = wim_apply_dentry_ntfs, + .apply_dentry_timestamps = wim_apply_dentry_timestamps, +}; +#endif + +static int apply_stream_list(struct list_head *stream_list, + struct apply_args *args, + const struct apply_operations *ops, + wimlib_progress_func_t progress_func) { - DEBUG("Extracting image %d", image); + uint64_t bytes_per_progress = args->progress.extract.total_bytes / 100; + uint64_t next_progress = bytes_per_progress; + struct lookup_table_entry *lte; + struct inode *inode; + struct dentry *dentry; + int ret = 0; + list_for_each_entry(lte, stream_list, staging_list) { + list_for_each_entry(inode, <e->inode_list, lte_inode_list) { + inode_for_each_dentry(dentry, inode) { + ret = ops->apply_dentry(dentry, args); + if (ret != 0) + goto out; + if (args->progress.extract.completed_bytes >= next_progress) { + progress_func(WIMLIB_PROGRESS_MSG_EXTRACT_STREAMS, + &args->progress); + next_progress += bytes_per_progress; + } + } + } + } +out: + return ret; +} +static int extract_single_image(WIMStruct *w, int image, + const char *target, int extract_flags, + wimlib_progress_func_t progress_func) +{ int ret; - ret = wimlib_select_image(w, image); + struct list_head stream_list; + struct hlist_head *inode_list; + + struct apply_args args; + const struct apply_operations *ops; + + args.w = w; + args.target = target; + args.extract_flags = extract_flags; + args.num_lutimes_warnings = 0; + args.target = target; + args.stream_list = &stream_list; + args.progress_func = progress_func; + + if (progress_func) { + args.progress.extract.image = image; + args.progress.extract.image_name = wimlib_get_image_name(w, image); + args.progress.extract.target = target; + } + +#ifdef WITH_NTFS_3G + if (extract_flags & WIMLIB_EXTRACT_FLAG_NTFS) { + args.vol = ntfs_mount(target, 0); + if (!args.vol) { + ERROR_WITH_ERRNO("Failed to mount NTFS volume `%s'", target); + return WIMLIB_ERR_NTFS_3G; + } + } +#endif + +#ifdef WITH_NTFS_3G + if (extract_flags & WIMLIB_EXTRACT_FLAG_NTFS) + ops = &ntfs_apply_operations; + else +#endif + ops = &normal_apply_operations; + + ret = select_wim_image(w, image); if (ret != 0) - return ret; + goto out; - struct extract_args args = { - .w = w, - .extract_flags = extract_flags, - .output_dir = output_dir, - #ifdef WITH_NTFS_3G - .scapi = NULL - #endif - }; + inode_list = &w->image_metadata[image - 1].inode_list; + find_streams_for_extraction(inode_list, + &stream_list, + w->lookup_table, + extract_flags); + + calculate_bytes_to_extract(&stream_list, extract_flags, + &args.progress); - ret = for_dentry_in_tree(wim_root_dentry(w), extract_dentry, &args); + if (progress_func) { + progress_func(WIMLIB_PROGRESS_MSG_EXTRACT_IMAGE_BEGIN, + &args.progress); + } + + if (extract_flags & WIMLIB_EXTRACT_FLAG_SEQUENTIAL) { + ret = sort_stream_list_by_wim_position(&stream_list); + if (ret != 0) { + WARNING("Falling back to non-sequential extraction"); + extract_flags &= ~WIMLIB_EXTRACT_FLAG_SEQUENTIAL; + } + } + + if (progress_func) { + progress_func(WIMLIB_PROGRESS_MSG_EXTRACT_DIR_STRUCTURE_BEGIN, + &args.progress); + } + + + args.extract_flags |= WIMLIB_EXTRACT_FLAG_NO_STREAMS; + ret = for_dentry_in_tree(wim_root_dentry(w), ops->apply_dentry, &args); + args.extract_flags &= ~WIMLIB_EXTRACT_FLAG_NO_STREAMS; if (ret != 0) - return ret; - return for_dentry_in_tree_depth(wim_root_dentry(w), - apply_dentry_timestamps, &args); + goto out; + if (progress_func) { + progress_func(WIMLIB_PROGRESS_MSG_EXTRACT_DIR_STRUCTURE_END, + &args.progress); + } + + ret = apply_stream_list(&stream_list, &args, ops, progress_func); + if (ret != 0) + goto out; + + if (progress_func) + progress_func(WIMLIB_PROGRESS_MSG_APPLY_TIMESTAMPS, NULL); + + ret = for_dentry_in_tree_depth(wim_root_dentry(w), + ops->apply_dentry_timestamps, &args); + if (ret != 0) + goto out; + + if (progress_func) { + progress_func(WIMLIB_PROGRESS_MSG_EXTRACT_IMAGE_END, + &args.progress); + } +out: +#ifdef WITH_NTFS_3G + if (extract_flags & WIMLIB_EXTRACT_FLAG_NTFS) { + if (ntfs_umount(args.vol, FALSE) != 0) { + ERROR_WITH_ERRNO("Failed to unmount NTFS volume `%s'", args.target); + if (ret == 0) + ret = WIMLIB_ERR_NTFS_3G; + } + } +#endif + return ret; } /* Extracts all images from the WIM to @output_dir, with the images placed in * subdirectories named by their image names. */ -static int extract_all_images(WIMStruct *w, const char *output_dir, - int extract_flags) +static int extract_all_images(WIMStruct *w, const char *target, + int extract_flags, + wimlib_progress_func_t progress_func) { size_t image_name_max_len = max(xml_get_max_image_name_len(w), 20); - size_t output_path_len = strlen(output_dir); + size_t output_path_len = strlen(target); char buf[output_path_len + 1 + image_name_max_len + 1]; int ret; int image; const char *image_name; - DEBUG("Attempting to extract all images from `%s'", w->filename); - - ret = extract_directory(output_dir, true); + ret = extract_directory(target, true); if (ret != 0) return ret; - memcpy(buf, output_dir, output_path_len); + memcpy(buf, target, output_path_len); buf[output_path_len] = '/'; for (image = 1; image <= w->hdr.image_count; image++) { - image_name = wimlib_get_image_name(w, image); - if (*image_name) { + if (image_name && *image_name) { strcpy(buf + output_path_len + 1, image_name); } else { /* Image name is empty. Use image number instead */ sprintf(buf + output_path_len + 1, "%d", image); } - ret = extract_single_image(w, image, buf, extract_flags); + ret = extract_single_image(w, image, buf, extract_flags, + progress_func); if (ret != 0) - goto done; + return ret; } -done: - /* Restore original output directory */ - buf[output_path_len + 1] = '\0'; return 0; } /* Extracts a single image or all images from a WIM file. */ WIMLIBAPI int wimlib_extract_image(WIMStruct *w, int image, - const char *output_dir, int flags) + const char *target, + int extract_flags, + WIMStruct **additional_swms, + unsigned num_additional_swms, + wimlib_progress_func_t progress_func) { - if (!output_dir) + struct lookup_table *joined_tab, *w_tab_save; + int ret; + + if (!w || !target) return WIMLIB_ERR_INVALID_PARAM; - if ((flags & (WIMLIB_EXTRACT_FLAG_SYMLINK | WIMLIB_EXTRACT_FLAG_HARDLINK)) + extract_flags &= WIMLIB_EXTRACT_MASK_PUBLIC; + + if ((extract_flags & (WIMLIB_EXTRACT_FLAG_SYMLINK | WIMLIB_EXTRACT_FLAG_HARDLINK)) == (WIMLIB_EXTRACT_FLAG_SYMLINK | WIMLIB_EXTRACT_FLAG_HARDLINK)) return WIMLIB_ERR_INVALID_PARAM; - for_lookup_table_entry(w->lookup_table, zero_out_refcnts, NULL); - - if (image == WIM_ALL_IMAGES) { - flags |= WIMLIB_EXTRACT_FLAG_MULTI_IMAGE; - return extract_all_images(w, output_dir, flags); - } else { - flags &= ~WIMLIB_EXTRACT_FLAG_MULTI_IMAGE; - return extract_single_image(w, image, output_dir, flags); + if (extract_flags & WIMLIB_EXTRACT_FLAG_NTFS) { +#ifdef WITH_NTFS_3G + if ((extract_flags & (WIMLIB_EXTRACT_FLAG_SYMLINK | WIMLIB_EXTRACT_FLAG_HARDLINK))) { + ERROR("Cannot specify symlink or hardlink flags when applying "); + ERROR("directly to a NTFS volume"); + return WIMLIB_ERR_INVALID_PARAM; + } + if (image == WIMLIB_ALL_IMAGES) { + ERROR("Can only apply a single image when applying " + "directly to a NTFS volume"); + return WIMLIB_ERR_INVALID_PARAM; + } +#else + ERROR("wimlib was compiled without support for NTFS-3g, so"); + ERROR("we cannot apply a WIM image directly to a NTFS volume"); + return WIMLIB_ERR_UNSUPPORTED; +#endif } -} - -WIMLIBAPI int wimlib_apply_image_to_ntfs_volume(WIMStruct *w, int image, - const char *device, int flags) -{ -#ifdef WITH_NTFS_3G - int ret; + ret = verify_swm_set(w, additional_swms, num_additional_swms); + if (ret != 0) + return ret; - if (!device) - return WIMLIB_ERR_INVALID_PARAM; - if (image == WIM_ALL_IMAGES) { - ERROR("Can only apply a single image when applying " - "directly to a NTFS volume"); - return WIMLIB_ERR_INVALID_PARAM; + if (num_additional_swms) { + ret = new_joined_lookup_table(w, additional_swms, + num_additional_swms, &joined_tab); + if (ret != 0) + return ret; + w_tab_save = w->lookup_table; + w->lookup_table = joined_tab; } - if (flags & (WIMLIB_EXTRACT_FLAG_SYMLINK | WIMLIB_EXTRACT_FLAG_HARDLINK)) { - ERROR("Cannot specifcy symlink or hardlink flags when applying "); - ERROR("directly to a NTFS volume"); - return WIMLIB_ERR_INVALID_PARAM; + + if (image == WIMLIB_ALL_IMAGES) { + extract_flags |= WIMLIB_EXTRACT_FLAG_MULTI_IMAGE; + ret = extract_all_images(w, target, extract_flags, + progress_func); + } else { + extract_flags &= ~WIMLIB_EXTRACT_FLAG_MULTI_IMAGE; + ret = extract_single_image(w, image, target, extract_flags, + progress_func); } - ret = wimlib_select_image(w, image); - if (ret != 0) - return ret; - if (getuid() != 0) { - ERROR("We are not root, but NTFS-3g requires root privileges to set arbitrary"); - ERROR("security data on the NTFS filesystem. Please run this program as root"); - ERROR("if you want to extract a WIM image while preserving NTFS-specific"); - ERROR("information."); + if (extract_flags & (WIMLIB_EXTRACT_FLAG_SYMLINK | + WIMLIB_EXTRACT_FLAG_HARDLINK)) + { + for_lookup_table_entry(w->lookup_table, + lte_free_extracted_file, + NULL); + } - return WIMLIB_ERR_NOT_ROOT; + if (num_additional_swms) { + free_lookup_table(w->lookup_table); + w->lookup_table = w_tab_save; } -#else /* WITH_NTFS_3G */ - ERROR("wimlib was compiled without support for NTFS-3g, so"); - ERROR("we cannot apply a WIM image directly to a NTFS volume"); - return WIMLIB_ERR_UNSUPPORTED; -#endif /* !WITH_NTFS_3G */ + return ret; }