* 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.
*/
/*
* 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/.
*/
* 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;
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++) {
*p++ = '.';
*p++ = '/';
}
- p2 = lte->file_on_disk;
+ p2 = lte->extracted_file;
while (*p2 == '/')
p2++;
while (num_output_dir_path_components--)
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;
}
* 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
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);
{
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;
}
WIMStruct *w;
int extract_flags;
const char *output_dir;
-#ifdef WITH_NTFS_3G
- struct SECURITY_API *scapi;
-#endif
};
/*
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);
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;
.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);
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)
}
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;
+ 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, zero_out_refcnts, 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;
}
git://wimlib.net / wimlib / blobdiff