X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fextract.c;h=1d755cff6280161c84a322664d665333d8966602;hp=c3b92b07c016509efbdbc386413de50615a54c90;hb=2441b3b94cf77a5193550682695dfaf930466764;hpb=dd20a8998242af4f340d81d586538a92e77feb2e diff --git a/src/extract.c b/src/extract.c index c3b92b07..1d755cff 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,16 +16,16 @@ * 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/. */ @@ -53,21 +58,19 @@ static int extract_regular_file_linked(const struct dentry *dentry, * instead either symlinks or hardlinks *all* identical files in * the WIM, even if they are in a different image (in the case * of a multi-image extraction) */ - - wimlib_assert(lte->file_on_disk); - + wimlib_assert(lte->extracted_file); if (extract_flags & WIMLIB_EXTRACT_FLAG_HARDLINK) { - if (link(lte->file_on_disk, output_path) != 0) { + 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; @@ -83,9 +86,9 @@ static int extract_regular_file_linked(const struct dentry *dentry, 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++) { @@ -93,7 +96,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--) @@ -102,7 +105,7 @@ 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; } @@ -120,11 +123,12 @@ 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; - if (head->next != head) { + if (head->next != head && + !(extract_flags & WIMLIB_EXTRACT_FLAG_MULTI_IMAGE)) + { /* 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 @@ -170,26 +174,12 @@ static int extract_regular_file_unlinked(WIMStruct *w, goto done; } - - 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; - } done: if (close(out_fd) != 0) { ERROR_WITH_ERRNO("Failed to close file `%s'", output_path); @@ -209,16 +199,16 @@ static int extract_regular_file(WIMStruct *w, { struct lookup_table_entry *lte; - lte = dentry_first_lte(dentry, w->lookup_table); + lte = dentry_unnamed_lte(dentry, w->lookup_table); if ((extract_flags & (WIMLIB_EXTRACT_FLAG_SYMLINK | WIMLIB_EXTRACT_FLAG_HARDLINK)) && lte) { - if (lte->out_refcnt++ != 0) + if (++lte->out_refcnt != 1) 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) + lte->extracted_file = STRDUP(output_path); + if (!lte->extracted_file) return WIMLIB_ERR_NOMEM; } @@ -287,9 +277,6 @@ struct extract_args { WIMStruct *w; int extract_flags; const char *output_dir; -#ifdef WITH_NTFS_3G - struct SECURITY_API *scapi; -#endif }; /* @@ -303,7 +290,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); @@ -315,18 +301,15 @@ 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 */ static int apply_dentry_timestamps(struct dentry *dentry, void *arg) { struct extract_args *args = arg; @@ -362,9 +345,6 @@ static int extract_single_image(WIMStruct *w, int image, .w = w, .extract_flags = extract_flags, .output_dir = output_dir, - #ifdef WITH_NTFS_3G - .scapi = NULL - #endif }; ret = for_dentry_in_tree(wim_root_dentry(w), extract_dentry, &args); @@ -388,7 +368,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) @@ -407,11 +388,8 @@ 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; }