* 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.
*/
/*
#include "wimlib_internal.h"
#include "xml.h"
-#ifdef WITH_NTFS_3G
-#include <ntfs-3g/volume.h>
-#include <ntfs-3g/security.h>
-#endif
-
-
/* Internal */
#define WIMLIB_EXTRACT_FLAG_MULTI_IMAGE 0x80000000
* 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;
}
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;
}
-
- 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);
{
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;
}
return 0;
}
+/* Apply timestamp to extracted file */
static int apply_dentry_timestamps(struct dentry *dentry, void *arg)
{
struct extract_args *args = arg;
}
}
-
-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 */
-}
git://wimlib.net / wimlib / blobdiff