X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fntfs-apply.c;h=d9f6d37a5da9445789bd5d7a1453b472a0d19b9b;hp=2857fc57ae50b9148338307b85a97a9a34fa497c;hb=fec65d853bbcfdb4639d8446db8d3c681c7ae00d;hpb=f7d48eea9e1a6a9620ee7d8e883a6505939c7777 diff --git a/src/ntfs-apply.c b/src/ntfs-apply.c index 2857fc57..d9f6d37a 100644 --- a/src/ntfs-apply.c +++ b/src/ntfs-apply.c @@ -1,9 +1,8 @@ /* * ntfs-apply.c * - * Apply a WIM image to a NTFS volume, restoring everything we can, including - * security data and alternate data streams. There should be no loss of - * information. + * Apply a WIM image to a NTFS volume. We restore everything we can, including + * security data and alternate data streams. */ /* @@ -12,16 +11,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/. */ @@ -36,10 +35,9 @@ #include #include #include -#include +#include /* security.h before xattrs.h */ +#include #include -#include -#include #include #include @@ -49,9 +47,12 @@ struct ntfs_apply_args { WIMStruct *w; }; -extern int _ntfs_set_file_security(ntfs_inode *ni, u32 selection, + +#if 0 +extern int ntfs_set_inode_security(ntfs_inode *ni, u32 selection, const char *attr); -extern int _ntfs_set_file_attributes(ntfs_inode *ni, s32 attrib); +extern int ntfs_set_inode_attributes(ntfs_inode *ni, u32 attrib); +#endif /* * Extracts a WIM resource to a NTFS attribute. @@ -61,7 +62,7 @@ extract_wim_resource_to_ntfs_attr(const struct lookup_table_entry *lte, ntfs_attr *na) { u64 bytes_remaining = wim_resource_size(lte); - char buf[min(WIM_CHUNK_SIZE, bytes_remaining)]; + u8 buf[min(WIM_CHUNK_SIZE, bytes_remaining)]; u64 offset = 0; int ret = 0; u8 hash[SHA1_HASH_SIZE]; @@ -85,7 +86,7 @@ extract_wim_resource_to_ntfs_attr(const struct lookup_table_entry *lte, sha1_final(hash, &ctx); if (!hashes_equal(hash, lte->hash)) { ERROR("Invalid checksum on a WIM resource " - "(detected when extracting to NTFS stream file)"); + "(detected when extracting to NTFS stream)"); ERROR("The following WIM resource is invalid:"); print_lookup_table_entry(lte); return WIMLIB_ERR_INVALID_RESOURCE_HASH; @@ -119,19 +120,38 @@ static int write_ntfs_data_streams(ntfs_inode *ni, const struct dentry *dentry, ntfs_attr *na; lte = dentry_stream_lte(dentry, stream_idx, w->lookup_table); - na = ntfs_attr_open(ni, AT_DATA, stream_name, stream_name_len); - if (!na) { - ERROR_WITH_ERRNO("Failed to open a data stream of " - "extracted file `%s'", - dentry->full_path_utf8); - ret = WIMLIB_ERR_NTFS_3G; - break; + + if (stream_name_len) { + /* Create an empty named stream. */ + ret = ntfs_attr_add(ni, AT_DATA, stream_name, + stream_name_len, NULL, 0); + if (ret != 0) { + ERROR_WITH_ERRNO("Failed to create name data " + "stream for extracted file " + "`%s'", + dentry->full_path_utf8); + ret = WIMLIB_ERR_NTFS_3G; + break; + + } } - if (lte) + /* If there's no lookup table entry, it's an empty stream. + * Otherwise, we must open the attribute and extract the data. + * */ + if (lte) { + na = ntfs_attr_open(ni, AT_DATA, stream_name, stream_name_len); + if (!na) { + ERROR_WITH_ERRNO("Failed to open a data stream of " + "extracted file `%s'", + dentry->full_path_utf8); + ret = WIMLIB_ERR_NTFS_3G; + break; + } ret = extract_wim_resource_to_ntfs_attr(lte, na); - ntfs_attr_close(na); - if (ret != 0) - break; + if (ret != 0) + break; + ntfs_attr_close(na); + } if (stream_idx == dentry->num_ads) break; stream_name = (ntfschar*)dentry->ads_entries[stream_idx].stream_name; @@ -156,21 +176,51 @@ static int wim_apply_hardlink_ntfs(const struct dentry *from_dentry, ntfs_inode **to_ni_ret) { int ret; + char *p; + char orig; + const char *dir_name; + ntfs_inode *to_ni; + ntfs_volume *vol; wimlib_assert(dentry_is_regular_file(from_dentry) && dentry_is_regular_file(to_dentry)); + if (ntfs_inode_close(dir_ni) != 0) { + ERROR_WITH_ERRNO("Error closing directory"); + return WIMLIB_ERR_NTFS_3G; + } + + vol = dir_ni->vol; + DEBUG("Extracting NTFS hard link `%s' => `%s'", from_dentry->full_path_utf8, to_dentry->extracted_file); - to_ni = ntfs_pathname_to_inode(dir_ni->vol, NULL, + to_ni = ntfs_pathname_to_inode(vol, NULL, to_dentry->extracted_file); if (!to_ni) { ERROR_WITH_ERRNO("Could not find NTFS inode for `%s'", to_dentry->extracted_file); return WIMLIB_ERR_NTFS_3G; } + p = from_dentry->full_path_utf8 + from_dentry->full_path_utf8_len; + do { + p--; + } while (*p != '/'); + + orig = *p; + *p = '\0'; + dir_name = from_dentry->full_path_utf8; + + dir_ni = ntfs_pathname_to_inode(vol, NULL, dir_name); + if (!dir_ni) { + ERROR_WITH_ERRNO("Could not find NTFS inode for `%s'", + from_dentry->full_path_utf8); + *p = orig; + return WIMLIB_ERR_NTFS_3G; + } + *p = orig; + ret = ntfs_link(to_ni, dir_ni, (ntfschar*)from_dentry->file_name, from_dentry->file_name_len / 2); @@ -184,34 +234,58 @@ static int wim_apply_hardlink_ntfs(const struct dentry *from_dentry, return ret; } +/*#define HAVE_NTFS_INODE_FUNCTIONS*/ + static int apply_file_attributes_and_security_data(ntfs_inode *ni, + ntfs_inode *dir_ni, const struct dentry *dentry, const WIMStruct *w) { DEBUG("Setting NTFS file attributes on `%s' to %#"PRIx32, dentry->full_path_utf8, dentry->attributes); - if (!_ntfs_set_file_attributes(ni, dentry->attributes)) { + int ret; +#ifdef HAVE_NTFS_INODE_FUNCTIONS + ret = ntfs_set_inode_attributes(ni, dentry->attributes); +#else + struct SECURITY_CONTEXT ctx; + u32 attributes_le32; + attributes_le32 = cpu_to_le32(dentry->attributes); + memset(&ctx, 0, sizeof(ctx)); + ctx.vol = ni->vol; + ret = ntfs_xattr_system_setxattr(&ctx, XATTR_NTFS_ATTRIB, + ni, dir_ni, + (const char*)&attributes_le32, + sizeof(u32), 0); +#endif + if (ret != 0) { ERROR("Failed to set NTFS file attributes on `%s'", dentry->full_path_utf8); return WIMLIB_ERR_NTFS_3G; } - if (dentry->security_id != -1) { const struct wim_security_data *sd; + const char *descriptor; sd = wim_const_security_data(w); wimlib_assert(dentry->security_id < sd->num_entries); + descriptor = sd->descriptors[dentry->security_id]; DEBUG("Applying security descriptor %d to `%s'", dentry->security_id, dentry->full_path_utf8); + + #ifdef HAVE_NTFS_INODE_FUNCTIONS u32 selection = OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION; + ret = ntfs_set_inode_security(ni, selection, descriptor); + #else + ret = ntfs_xattr_system_setxattr(&ctx, XATTR_NTFS_ACL, + ni, dir_ni, descriptor, + sd->sizes[dentry->security_id], 0); + #endif - if (!_ntfs_set_file_security(ni, selection, - sd->descriptors[dentry->security_id])) - { + if (ret != 0) { ERROR_WITH_ERRNO("Failed to set security data on `%s'", dentry->full_path_utf8); return WIMLIB_ERR_NTFS_3G; @@ -228,7 +302,9 @@ static int apply_reparse_data(ntfs_inode *ni, const struct dentry *dentry, wimlib_assert(dentry->attributes & FILE_ATTRIBUTE_REPARSE_POINT); - lte = dentry_first_lte(dentry, w->lookup_table); + lte = dentry_unnamed_lte(dentry, w->lookup_table); + + DEBUG("Applying reparse data to `%s'", dentry->full_path_utf8); if (!lte) { ERROR("Could not find reparse data for `%s'", @@ -242,8 +318,8 @@ static int apply_reparse_data(ntfs_inode *ni, const struct dentry *dentry, return WIMLIB_ERR_INVALID_DENTRY; } - char reparse_data_buf[8 + wim_resource_size(lte)]; - char *p = reparse_data_buf; + u8 reparse_data_buf[8 + wim_resource_size(lte)]; + u8 *p = reparse_data_buf; p = put_u32(p, dentry->reparse_tag); /* ReparseTag */ p = put_u16(p, wim_resource_size(lte)); /* ReparseDataLength */ p = put_u16(p, 0); /* Reserved */ @@ -252,7 +328,7 @@ static int apply_reparse_data(ntfs_inode *ni, const struct dentry *dentry, if (ret != 0) return ret; - ret = ntfs_set_ntfs_reparse_data(ni, reparse_data_buf, + ret = ntfs_set_ntfs_reparse_data(ni, (char*)reparse_data_buf, wim_resource_size(lte) + 8, 0); if (ret != 0) { ERROR_WITH_ERRNO("Failed to set NTFS reparse data on `%s'", @@ -262,6 +338,74 @@ static int apply_reparse_data(ntfs_inode *ni, const struct dentry *dentry, return 0; } +static int do_wim_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni, + WIMStruct *w); + +/* + * If @dentry is part of a hard link group, search for hard-linked dentries in + * the same directory that have a nonempty DOS (short) filename. There should + * be exactly 0 or 1 such dentries. If there is 1, extract that dentry first, + * so that the DOS name is correctly associated with the corresponding long name + * in the Win32 namespace, and not any of the additional names in the POSIX + * namespace created from hard links. + */ +static int preapply_dentry_with_dos_name(struct dentry *dentry, + ntfs_inode **dir_ni_p, + WIMStruct *w) +{ + struct dentry *other; + struct dentry *dentry_with_dos_name; + + dentry_with_dos_name = NULL; + list_for_each_entry(other, &dentry->link_group_list, + link_group_list) + { + if (dentry->parent == other->parent && other->short_name_len) { + if (dentry_with_dos_name) { + ERROR("Found multiple DOS names for file `%s' " + "in the same directory", + dentry_with_dos_name->full_path_utf8); + return WIMLIB_ERR_INVALID_DENTRY; + } + dentry_with_dos_name = other; + } + } + /* If there's a dentry with a DOS name, extract it first */ + if (dentry_with_dos_name + && !dentry_with_dos_name->extracted_file) + { + char *p; + const char *dir_name; + char orig; + int ret; + ntfs_volume *vol = (*dir_ni_p)->vol; + + DEBUG("pre-applying DOS name `%s'", + dentry_with_dos_name->full_path_utf8); + ret = do_wim_apply_dentry_ntfs(dentry_with_dos_name, + *dir_ni_p, w); + if (ret != 0) + return ret; + p = dentry->full_path_utf8 + dentry->full_path_utf8_len; + do { + p--; + } while (*p != '/'); + + orig = *p; + *p = '\0'; + dir_name = dentry->full_path_utf8; + + *dir_ni_p = ntfs_pathname_to_inode(vol, NULL, dir_name); + *p = orig; + if (!*dir_ni_p) { + ERROR_WITH_ERRNO("Could not find NTFS inode for `%s'", + dir_name); + return WIMLIB_ERR_NTFS_3G; + } + } + return 0; +} + /* * Applies a WIM dentry to a NTFS filesystem. * @@ -272,45 +416,49 @@ static int apply_reparse_data(ntfs_inode *ni, const struct dentry *dentry, * @return: 0 on success; nonzero on failure. */ static int do_wim_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni, - WIMStruct *w) + WIMStruct *w) { int ret = 0; mode_t type; ntfs_inode *ni = NULL; - ntfs_inode *hardlink_target_ni = NULL; + bool is_hardlink = false; + ntfs_volume *vol = dir_ni->vol; if (dentry->attributes & FILE_ATTRIBUTE_DIRECTORY) { type = S_IFDIR; } else { + struct dentry *other; + + /* Apply hard-linked directory in same directory with DOS name + * (if there is one) before this dentry */ + if (dentry->short_name_len == 0) { + ret = preapply_dentry_with_dos_name(dentry, + &dir_ni, w); + if (ret != 0) + return ret; + } + type = S_IFREG; - const struct list_head *head = &dentry->link_group_list; - if (head->next != head) { - /* 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 it. Otherwise, - * extract the file, and set the dentry->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) { - ret = wim_apply_hardlink_ntfs(dentry, - other, - dir_ni, - &hardlink_target_ni); - if (ret != 0) - goto out_close_dir; - else - goto out_set_dos_name; + /* See if we can make a hard link */ + list_for_each_entry(other, &dentry->link_group_list, + link_group_list) { + if (other->extracted_file) { + /* Already extracted another dentry in the hard + * link group. We can make a hard link instead + * of extracting the file data. */ + ret = wim_apply_hardlink_ntfs(dentry, other, + dir_ni, &ni); + is_hardlink = true; + if (ret) { + goto out_close_dir_ni; + } else { + dentry->extracted_file = dentry->full_path_utf8; + goto out_set_dos_name; } } } - FREE(dentry->extracted_file); - dentry->extracted_file = STRDUP(dentry->full_path_utf8); - if (!dentry->extracted_file) { - ERROR("Failed to allocate memory for filename"); - return WIMLIB_ERR_NOMEM; - } + /* Can't make a hard link; extract the file itself */ + dentry->extracted_file = dentry->full_path_utf8; } /* @@ -326,7 +474,7 @@ static int do_wim_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni, ERROR_WITH_ERRNO("Could not create NTFS object for `%s'", dentry->full_path_utf8); ret = WIMLIB_ERR_NTFS_3G; - goto out_close_new; + goto out_close_dir_ni; } /* Write the data streams, unless this is a directory or reparse point @@ -335,24 +483,24 @@ static int do_wim_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni, !(dentry->attributes & FILE_ATTRIBUTE_REPARSE_POINT)) { ret = write_ntfs_data_streams(ni, dentry, w); if (ret != 0) - goto out_close_new; + goto out_close_dir_ni; } - ret = apply_file_attributes_and_security_data(ni, dentry, w); + ret = apply_file_attributes_and_security_data(ni, dir_ni, dentry, w); if (ret != 0) - goto out_close_new; + goto out_close_dir_ni; if (dentry->attributes & FILE_ATTR_REPARSE_POINT) { ret = apply_reparse_data(ni, dentry, w); if (ret != 0) - goto out_close_new; + goto out_close_dir_ni; } out_set_dos_name: -#if 0 /* Set DOS (short) name if given */ if (dentry->short_name_len != 0) { + char *short_name_utf8; size_t short_name_utf8_len; short_name_utf8 = utf16_to_utf8(dentry->short_name, @@ -361,16 +509,49 @@ out_set_dos_name: if (!short_name_utf8) { ERROR("Out of memory"); ret = WIMLIB_ERR_NOMEM; - goto out_close_new; + goto out_close_dir_ni; } - if (!ni) { - ni = ntfs_pathname_to_inode(dir_ni->vol, NULL, - dentry->full_path_utf8); + if (is_hardlink) { + char *p; + char orig; + const char *dir_name; + + /* ntfs_set_ntfs_dos_name() closes the inodes in the + * wrong order if we have applied a hard link. Close + * them ourselves, then re-open then. */ + if (ntfs_inode_close(dir_ni) != 0) { + if (ret == 0) + ret = WIMLIB_ERR_NTFS_3G; + ERROR_WITH_ERRNO("Failed to close directory inode"); + } + if (ntfs_inode_close(ni) != 0) { + if (ret == 0) + ret = WIMLIB_ERR_NTFS_3G; + ERROR_WITH_ERRNO("Failed to close hard link target inode"); + } + p = dentry->full_path_utf8 + dentry->full_path_utf8_len; + do { + p--; + } while (*p != '/'); + + orig = *p; + *p = '\0'; + dir_name = dentry->full_path_utf8; + + dir_ni = ntfs_pathname_to_inode(vol, NULL, dir_name); + *p = orig; + if (!dir_ni) { + ERROR_WITH_ERRNO("Could not find NTFS inode for `%s'", + dir_name); + return WIMLIB_ERR_NTFS_3G; + } + ni = ntfs_pathname_to_inode(vol, dir_ni, + dentry->file_name_utf8); if (!ni) { - ERROR_WITH_ERRNO("Failed to find inode for `%s'", - dentry->full_path_utf8); - goto out_close_dir; + ERROR_WITH_ERRNO("Could not find NTFS inode for `%s'", + dir_name); + return WIMLIB_ERR_NTFS_3G; } } @@ -385,28 +566,20 @@ out_set_dos_name: dentry->full_path_utf8); ret = WIMLIB_ERR_NTFS_3G; } - goto out_close_hardlink_target; + /* inodes have been closed by ntfs_set_ntfs_dos_name(). */ + return ret; } -#endif -out_close_new: - if (ni && ntfs_inode_close_in_dir(ni, dir_ni) != 0) { - ERROR_WITH_ERRNO("Failed to close new inode"); - ret = WIMLIB_ERR_NTFS_3G; - } -out_close_dir: +out_close_dir_ni: if (ntfs_inode_close(dir_ni) != 0) { if (ret == 0) ret = WIMLIB_ERR_NTFS_3G; ERROR_WITH_ERRNO("Failed to close directory inode"); } -out_close_hardlink_target: - if (hardlink_target_ni) { - if (ntfs_inode_close(hardlink_target_ni) != 0) { - if (ret == 0) - ret = WIMLIB_ERR_NTFS_3G; - ERROR_WITH_ERRNO("Failed to close hardlink target inode"); - } + if (ni && ntfs_inode_close(ni) != 0) { + if (ret == 0) + ret = WIMLIB_ERR_NTFS_3G; + ERROR_WITH_ERRNO("Failed to close inode"); } return ret; } @@ -424,7 +597,7 @@ static int wim_apply_root_dentry_ntfs(const struct dentry *dentry, ERROR_WITH_ERRNO("Could not find root NTFS inode"); return WIMLIB_ERR_NTFS_3G; } - ret = apply_file_attributes_and_security_data(ni, dentry, w); + ret = apply_file_attributes_and_security_data(ni, ni, dentry, w); if (ntfs_inode_close(ni) != 0) { ERROR_WITH_ERRNO("Failed to close NTFS inode for root " "directory"); @@ -441,12 +614,13 @@ static int wim_apply_dentry_ntfs(struct dentry *dentry, void *arg) int extract_flags = args->extract_flags; WIMStruct *w = args->w; ntfs_inode *dir_ni; - int ret; char *p; char orig; - ntfs_inode *close_after_dir; const char *dir_name; + if (dentry->extracted_file) + return 0; + wimlib_assert(dentry->full_path_utf8); DEBUG("Applying dentry `%s' to NTFS", dentry->full_path_utf8); @@ -473,7 +647,6 @@ static int wim_apply_dentry_ntfs(struct dentry *dentry, void *arg) dir_name); return WIMLIB_ERR_NTFS_3G; } - DEBUG("Found NTFS inode for `%s'", dir_name); return do_wim_apply_dentry_ntfs(dentry, dir_ni, w); } @@ -481,10 +654,8 @@ static int wim_apply_dentry_timestamps(struct dentry *dentry, void *arg) { struct ntfs_apply_args *args = arg; ntfs_volume *vol = args->vol; - int extract_flags = args->extract_flags; - WIMStruct *w = args->w; - char *p; - char buf[24]; + u8 *p; + u8 buf[24]; ntfs_inode *ni; int ret = 0; @@ -502,7 +673,7 @@ static int wim_apply_dentry_timestamps(struct dentry *dentry, void *arg) p = put_u64(p, dentry->creation_time); p = put_u64(p, dentry->last_write_time); p = put_u64(p, dentry->last_access_time); - ret = ntfs_inode_set_times(ni, buf, 3 * sizeof(u64), 0); + ret = ntfs_inode_set_times(ni, (const char*)buf, 3 * sizeof(u64), 0); if (ret != 0) { ERROR_WITH_ERRNO("Failed to set NTFS timestamps on `%s'", dentry->full_path_utf8); @@ -518,31 +689,52 @@ static int wim_apply_dentry_timestamps(struct dentry *dentry, void *arg) return ret; } +static int dentry_clear_extracted_file(struct dentry *dentry, void *ignore) +{ + if (dentry->extracted_file != dentry->full_path_utf8) + FREE(dentry->extracted_file); + dentry->extracted_file = NULL; + return 0; +} + static int do_wim_apply_image_ntfs(WIMStruct *w, const char *device, int extract_flags) { ntfs_volume *vol; int ret; + struct dentry *root; + struct ntfs_apply_args args; + DEBUG("Mounting NTFS volume `%s'", device); vol = ntfs_mount(device, 0); if (!vol) { ERROR_WITH_ERRNO("Failed to mount NTFS volume `%s'", device); return WIMLIB_ERR_NTFS_3G; } - struct ntfs_apply_args args = { - .vol = vol, - .extract_flags = extract_flags, - .w = w, - }; - ret = for_dentry_in_tree(wim_root_dentry(w), wim_apply_dentry_ntfs, - &args); + args.vol = vol; + args.extract_flags = extract_flags; + args.w = w; + root = wim_root_dentry(w); + for_dentry_in_tree(root, dentry_clear_extracted_file, NULL); + + ret = for_dentry_in_tree(root, wim_apply_dentry_ntfs, &args); if (ret != 0) goto out; - DEBUG("Setting NTFS timestamps"); - ret = for_dentry_in_tree_depth(wim_root_dentry(w), - wim_apply_dentry_timestamps, + + if (extract_flags & WIMLIB_EXTRACT_FLAG_VERBOSE) + printf("Setting timestamps of extracted files on NTFS " + "volume `%s'\n", device); + ret = for_dentry_in_tree_depth(root, wim_apply_dentry_timestamps, &args); + + if (ret == 0 && (extract_flags & WIMLIB_EXTRACT_FLAG_VERBOSE)) + printf("Finished applying image %d of %s to NTFS " + "volume `%s'\n", + w->current_image, + w->filename ? w->filename : "WIM", + device); out: + DEBUG("Unmounting NTFS volume `%s'", device); if (ntfs_umount(vol, FALSE) != 0) { ERROR_WITH_ERRNO("Failed to unmount NTFS volume `%s'", device); if (ret == 0) @@ -560,11 +752,18 @@ out: * full filesystem to be applied to the volume. */ WIMLIBAPI int wimlib_apply_image_to_ntfs_volume(WIMStruct *w, int image, - const char *device, int flags) + const char *device, int flags, + WIMStruct **additional_swms, + unsigned num_additional_swms) { + struct lookup_table *joined_tab, *w_tab_save; int ret; - if (!device) + DEBUG("w->filename = %s, image = %d, device = %s, flags = 0x%x, " + "num_additional_swms = %u", + w->filename, image, device, flags, num_additional_swms); + + if (!w || !device) return WIMLIB_ERR_INVALID_PARAM; if (image == WIM_ALL_IMAGES) { ERROR("Can only apply a single image when applying " @@ -576,26 +775,39 @@ WIMLIBAPI int wimlib_apply_image_to_ntfs_volume(WIMStruct *w, int image, ERROR("directly to a NTFS volume"); return WIMLIB_ERR_INVALID_PARAM; } - ret = wimlib_select_image(w, image); + + ret = verify_swm_set(w, additional_swms, num_additional_swms); if (ret != 0) return ret; -#if 0 - 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."); + 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; + } - return WIMLIB_ERR_NOT_ROOT; + ret = wimlib_select_image(w, image); + if (ret != 0) + goto out; + + ret = do_wim_apply_image_ntfs(w, device, flags); + +out: + if (num_additional_swms) { + free_lookup_table(w->lookup_table); + w->lookup_table = w_tab_save; } -#endif - return do_wim_apply_image_ntfs(w, device, flags); + return ret; } #else /* WITH_NTFS_3G */ WIMLIBAPI int wimlib_apply_image_to_ntfs_volume(WIMStruct *w, int image, - const char *device, int flags) + const char *device, int flags, + WIMStruct **additional_swms, + unsigned num_additional_swms) { ERROR("wimlib was compiled without support for NTFS-3g, so"); ERROR("we cannot apply a WIM image directly to a NTFS volume");