int out_fd;
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;
+ }
}
}
/* 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;
int extract_flags)
{
struct lookup_table_entry *lte;
+ const struct inode *inode = dentry->d_inode;
- lte = dentry_unnamed_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,
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);
if (ret <= 0) {
ERROR("Could not read the symbolic link from dentry `%s'",
dentry->full_path_utf8);
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 */
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]);
+ wim_timestamp_to_timeval(dentry->d_inode->last_access_time, &tv[0]);
+ wim_timestamp_to_timeval(dentry->d_inode->last_write_time, &tv[1]);
if (lutimes(output_path, tv) != 0) {
WARNING("Failed to set timestamp on file `%s': %s",
output_path, strerror(errno));
.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;
- 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;
}
git://wimlib.net / wimlib / blobdiff