X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fextract.c;h=b1b740f06a4f368bd40064ad3edc814fa0de3cd8;hb=60b8f54df8fed44136bdc8ec615ee62703d87b69;hp=da637d2e55593345e06a1cc908d40511a9111b27;hpb=150fd376ac944f0fdc22c0df7beaa8dbd076061c;p=wimlib diff --git a/src/extract.c b/src/extract.c index da637d2e..b1b740f0 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/. */ @@ -40,12 +45,6 @@ #include "wimlib_internal.h" #include "xml.h" -#ifdef WITH_NTFS_3G -#include -#include -#endif - - /* Internal */ #define WIMLIB_EXTRACT_FLAG_MULTI_IMAGE 0x80000000 @@ -59,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; @@ -89,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++) { @@ -99,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--) @@ -108,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; } @@ -126,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 @@ -176,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); @@ -215,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; } @@ -333,6 +317,7 @@ static int extract_dentry(struct dentry *dentry, void *arg) return 0; } +/* Apply timestamp to extracted file */ static int apply_dentry_timestamps(struct dentry *dentry, void *arg) { struct extract_args *args = arg; @@ -443,40 +428,3 @@ WIMLIBAPI int wimlib_extract_image(WIMStruct *w, int image, } } - -WIMLIBAPI int wimlib_apply_image_to_ntfs_volume(WIMStruct *w, int image, - const char *device, int flags) -{ -#ifdef WITH_NTFS_3G - int 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 (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; - } - 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."); - - return WIMLIB_ERR_NOT_ROOT; - } -#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 */ -}