X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fextract.c;h=6e341cc0f396c414992efe0c5e7935750a26cd71;hp=ec6842dcf826ab96a4ea3146e416ab20000130ee;hb=051a59e4c6d114fc7abfa14ff78436adab5defb9;hpb=7be97dea91241da8a7ca5f0ff32f320e692fe53f diff --git a/src/extract.c b/src/extract.c index ec6842dc..6e341cc0 100644 --- a/src/extract.c +++ b/src/extract.c @@ -16,29 +16,35 @@ * 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 + +#ifdef HAVE_UTIME_H +#include +#endif + #include -#include "config.h" #include "dentry.h" #include "lookup_table.h" #include "timestamp.h" @@ -48,7 +54,7 @@ /* Internal */ #define WIMLIB_EXTRACT_FLAG_MULTI_IMAGE 0x80000000 -static int extract_regular_file_linked(const struct dentry *dentry, +static int extract_regular_file_linked(const struct dentry *dentry, const char *output_dir, const char *output_path, int extract_flags, @@ -77,7 +83,7 @@ static int extract_regular_file_linked(const struct dentry *dentry, 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); @@ -114,7 +120,7 @@ static int extract_regular_file_linked(const struct dentry *dentry, } static int extract_regular_file_unlinked(WIMStruct *w, - struct dentry *dentry, + struct dentry *dentry, const char *output_path, int extract_flags, struct lookup_table_entry *lte) @@ -123,39 +129,38 @@ static int extract_regular_file_unlinked(WIMStruct *w, * 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; + struct inode *inode = dentry->d_inode; - if (head->next != head && - !(extract_flags & WIMLIB_EXTRACT_FLAG_MULTI_IMAGE)) + if (!((extract_flags & WIMLIB_EXTRACT_FLAG_MULTI_IMAGE) + && (extract_flags & (WIMLIB_EXTRACT_FLAG_SYMLINK | + WIMLIB_EXTRACT_FLAG_HARDLINK)))) { - /* 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 + /* 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; + } } } @@ -172,16 +177,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; } ret = extract_full_wim_resource_to_fd(lte, out_fd); if (ret != 0) { ERROR("Failed to extract resource to `%s'", output_path); - goto done; + goto out; } -done: +out: if (close(out_fd) != 0) { ERROR_WITH_ERRNO("Failed to close file `%s'", output_path); ret = WIMLIB_ERR_WRITE; @@ -189,28 +194,31 @@ 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, +static int extract_regular_file(WIMStruct *w, + struct dentry *dentry, const char *output_dir, const char *output_path, int extract_flags) { struct lookup_table_entry *lte; + const struct inode *inode = dentry->d_inode; - lte = dentry_first_lte(dentry, w->lookup_table); + lte = inode_unnamed_lte(inode, w->lookup_table); if ((extract_flags & (WIMLIB_EXTRACT_FLAG_SYMLINK | WIMLIB_EXTRACT_FLAG_HARDLINK)) && lte) { - if (++lte->out_refcnt != 1) + if (lte->extracted_file) { return extract_regular_file_linked(dentry, output_dir, output_path, extract_flags, lte); - lte->extracted_file = STRDUP(output_path); - if (!lte->extracted_file) - return WIMLIB_ERR_NOMEM; + } else { + lte->extracted_file = STRDUP(output_path); + if (!lte->extracted_file) + return WIMLIB_ERR_NOMEM; + } } return extract_regular_file_unlinked(w, dentry, output_path, @@ -222,7 +230,8 @@ static int extract_symlink(const struct dentry *dentry, const char *output_path, const WIMStruct *w) { char target[4096]; - ssize_t ret = dentry_readlink(dentry, target, sizeof(target), w); + ssize_t ret = inode_readlink(dentry->d_inode, target, + sizeof(target), w, 0); if (ret <= 0) { ERROR("Could not read the symbolic link from dentry `%s'", dentry->full_path_utf8); @@ -237,12 +246,12 @@ static int extract_symlink(const struct dentry *dentry, const char *output_path, 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) { @@ -278,12 +287,10 @@ struct extract_args { WIMStruct *w; int extract_flags; const char *output_dir; -#ifdef WITH_NTFS_3G - struct SECURITY_API *scapi; -#endif + unsigned num_lutimes_warnings; }; -/* +/* * Extracts a file, directory, or symbolic link from the WIM archive. For use * in for_dentry_in_tree(). */ @@ -294,7 +301,6 @@ static int extract_dentry(struct dentry *dentry, void *arg) int extract_flags = args->extract_flags; size_t len = strlen(args->output_dir); char output_path[len + dentry->full_path_utf8_len + 1]; - int ret; if (extract_flags & WIMLIB_EXTRACT_FLAG_VERBOSE) { wimlib_assert(dentry->full_path_utf8); @@ -306,16 +312,12 @@ static int extract_dentry(struct dentry *dentry, void *arg) output_path[len + dentry->full_path_utf8_len] = '\0'; if (dentry_is_symlink(dentry)) - ret = extract_symlink(dentry, output_path, w); + return extract_symlink(dentry, output_path, w); else if (dentry_is_directory(dentry)) - ret = extract_directory(output_path, dentry_is_root(dentry)); + return extract_directory(output_path, dentry_is_root(dentry)); else - ret = extract_regular_file(w, dentry, args->output_dir, + return extract_regular_file(w, dentry, args->output_dir, output_path, extract_flags); - if (ret != 0) - return ret; - - return 0; } /* Apply timestamp to extracted file */ @@ -324,17 +326,37 @@ static int apply_dentry_timestamps(struct dentry *dentry, void *arg) struct extract_args *args = arg; size_t len = strlen(args->output_dir); 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 + 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; } @@ -346,17 +368,15 @@ static int extract_single_image(WIMStruct *w, int image, DEBUG("Extracting image %d", image); int ret; - ret = wimlib_select_image(w, image); + ret = select_wim_image(w, image); if (ret != 0) return ret; struct extract_args args = { - .w = w, - .extract_flags = extract_flags, - .output_dir = output_dir, - #ifdef WITH_NTFS_3G - .scapi = NULL - #endif + .w = w, + .extract_flags = extract_flags, + .output_dir = output_dir, + .num_lutimes_warnings = 0, }; ret = for_dentry_in_tree(wim_root_dentry(w), extract_dentry, &args); @@ -380,7 +400,8 @@ static int extract_all_images(WIMStruct *w, const char *output_dir, int image; const char *image_name; - DEBUG("Attempting to extract all images from `%s'", w->filename); + DEBUG("Attempting to extract all images from `%s' to `%s'", + w->filename, output_dir); ret = extract_directory(output_dir, true); if (ret != 0) @@ -389,7 +410,7 @@ static int extract_all_images(WIMStruct *w, const char *output_dir, memcpy(buf, output_dir, 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) { strcpy(buf + output_path_len + 1, image_name); @@ -399,33 +420,58 @@ static int extract_all_images(WIMStruct *w, const char *output_dir, } ret = extract_single_image(w, image, buf, extract_flags); 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 *output_dir, int flags, + WIMStruct **additional_swms, + unsigned num_additional_swms) { - if (!output_dir) + struct lookup_table *joined_tab, *w_tab_save; + int ret; + + DEBUG("w->filename = %s, image = %d, output_dir = %s, flags = 0x%x, " + "num_additional_swms = %u", + w->filename, image, output_dir, flags, num_additional_swms); + + if (!w || !output_dir) return WIMLIB_ERR_INVALID_PARAM; if ((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); + ret = verify_swm_set(w, additional_swms, num_additional_swms); + if (ret != 0) + return ret; + + 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; + } + + for_lookup_table_entry(w->lookup_table, lte_free_extracted_file, NULL); if (image == WIM_ALL_IMAGES) { flags |= WIMLIB_EXTRACT_FLAG_MULTI_IMAGE; - return extract_all_images(w, output_dir, flags); + ret = extract_all_images(w, output_dir, flags); } else { flags &= ~WIMLIB_EXTRACT_FLAG_MULTI_IMAGE; - return extract_single_image(w, image, output_dir, flags); + ret = extract_single_image(w, image, output_dir, flags); } + if (num_additional_swms) { + free_lookup_table(w->lookup_table); + w->lookup_table = w_tab_save; + } + return ret; }