X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fntfs-apply.c;h=9b880a3dd6e047209f33aab0de76138469f0b723;hp=108418b3444c8020b0f2d5f65d7fc2a3a1237e7f;hb=051a59e4c6d114fc7abfa14ff78436adab5defb9;hpb=239e67483b8d6759fa97f25a65011cc3480368bc diff --git a/src/ntfs-apply.c b/src/ntfs-apply.c index 108418b3..9b880a3d 100644 --- a/src/ntfs-apply.c +++ b/src/ntfs-apply.c @@ -24,7 +24,14 @@ * along with wimlib; if not, see http://www.gnu.org/licenses/. */ + #include "config.h" + +#ifdef WITH_NTFS_3G +#include +#include +#endif + #include "wimlib_internal.h" @@ -35,10 +42,9 @@ #include #include #include -#include +#include /* security.h before xattrs.h */ +#include #include -#include -#include #include #include @@ -48,14 +54,7 @@ struct ntfs_apply_args { WIMStruct *w; }; - -#ifndef WITH_NEW_NTFS_3G -extern int ntfs_set_inode_security(ntfs_inode *ni, u32 selection, - const char *attr); -extern int ntfs_set_inode_attributes(ntfs_inode *ni, u32 attrib); -#endif - -/* +/* * Extracts a WIM resource to a NTFS attribute. */ static int @@ -73,7 +72,7 @@ extract_wim_resource_to_ntfs_attr(const struct lookup_table_entry *lte, while (bytes_remaining) { u64 to_read = min(bytes_remaining, WIM_CHUNK_SIZE); - ret = read_wim_resource(lte, buf, to_read, offset, false); + ret = read_wim_resource(lte, buf, to_read, offset, 0); if (ret != 0) break; sha1_update(&ctx, buf, to_read); @@ -98,7 +97,7 @@ extract_wim_resource_to_ntfs_attr(const struct lookup_table_entry *lte, /* Writes the data streams to a NTFS file * * @ni: The NTFS inode for the file. - * @dentry: The directory entry in the WIM file. + * @inode: The WIM dentry that has an inode containing the streams. * @w: The WIMStruct for the WIM containing the image we are applying. * * Returns 0 on success, nonzero on failure. @@ -110,17 +109,18 @@ static int write_ntfs_data_streams(ntfs_inode *ni, const struct dentry *dentry, unsigned stream_idx = 0; ntfschar *stream_name = AT_UNNAMED; u32 stream_name_len = 0; + const struct inode *inode = dentry->d_inode; DEBUG("Writing %u NTFS data stream%s for `%s'", - dentry->num_ads + 1, - (dentry->num_ads == 0 ? "" : "s"), + inode->num_ads + 1, + (inode->num_ads == 0 ? "" : "s"), dentry->full_path_utf8); while (1) { struct lookup_table_entry *lte; ntfs_attr *na; - lte = dentry_stream_lte(dentry, stream_idx, w->lookup_table); + lte = inode_stream_lte(inode, stream_idx, w->lookup_table); if (stream_name_len) { /* Create an empty named stream. */ @@ -153,10 +153,10 @@ static int write_ntfs_data_streams(ntfs_inode *ni, const struct dentry *dentry, break; ntfs_attr_close(na); } - if (stream_idx == dentry->num_ads) + if (stream_idx == inode->num_ads) break; - stream_name = (ntfschar*)dentry->ads_entries[stream_idx].stream_name; - stream_name_len = dentry->ads_entries[stream_idx].stream_name_len / 2; + stream_name = (ntfschar*)inode->ads_entries[stream_idx].stream_name; + stream_name_len = inode->ads_entries[stream_idx].stream_name_len / 2; stream_idx++; } return ret; @@ -167,12 +167,12 @@ static int write_ntfs_data_streams(ntfs_inode *ni, const struct dentry *dentry, * * It is named @from_dentry->file_name and is located under the directory * specified by @dir_ni, and it is made to point to the previously extracted - * file located at @to_dentry->extracted_file. + * file located at @inode->extracted_file. * * Return 0 on success, nonzero on failure. */ static int wim_apply_hardlink_ntfs(const struct dentry *from_dentry, - const struct dentry *to_dentry, + const struct inode *inode, ntfs_inode *dir_ni, ntfs_inode **to_ni_ret) { @@ -185,7 +185,7 @@ static int wim_apply_hardlink_ntfs(const struct dentry *from_dentry, ntfs_volume *vol; wimlib_assert(dentry_is_regular_file(from_dentry) - && dentry_is_regular_file(to_dentry)); + && inode_is_regular_file(inode)); if (ntfs_inode_close(dir_ni) != 0) { ERROR_WITH_ERRNO("Error closing directory"); @@ -195,13 +195,12 @@ static int wim_apply_hardlink_ntfs(const struct dentry *from_dentry, vol = dir_ni->vol; DEBUG("Extracting NTFS hard link `%s' => `%s'", - from_dentry->full_path_utf8, to_dentry->extracted_file); + from_dentry->full_path_utf8, inode->extracted_file); - to_ni = ntfs_pathname_to_inode(vol, NULL, - to_dentry->extracted_file); + to_ni = ntfs_pathname_to_inode(vol, NULL, inode->extracted_file); if (!to_ni) { ERROR_WITH_ERRNO("Could not find NTFS inode for `%s'", - to_dentry->extracted_file); + inode->extracted_file); return WIMLIB_ERR_NTFS_3G; } p = from_dentry->full_path_utf8 + from_dentry->full_path_utf8_len; @@ -228,7 +227,7 @@ static int wim_apply_hardlink_ntfs(const struct dentry *from_dentry, if (ret != 0) { ERROR_WITH_ERRNO("Could not create hard link `%s' => `%s'", from_dentry->full_path_utf8, - to_dentry->extracted_file); + inode->extracted_file); ret = WIMLIB_ERR_NTFS_3G; } *to_ni_ret = to_ni; @@ -237,32 +236,42 @@ static int wim_apply_hardlink_ntfs(const struct dentry *from_dentry, 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_inode_attributes(ni, dentry->attributes)) { + dentry->full_path_utf8, dentry->d_inode->attributes); + int ret; + struct SECURITY_CONTEXT ctx; + u32 attributes_le32; + attributes_le32 = cpu_to_le32(dentry->d_inode->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); + 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) { + if (dentry->d_inode->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); + wimlib_assert(dentry->d_inode->security_id < sd->num_entries); + descriptor = (const char *)sd->descriptors[dentry->d_inode->security_id]; DEBUG("Applying security descriptor %d to `%s'", - dentry->security_id, dentry->full_path_utf8); - u32 selection = OWNER_SECURITY_INFORMATION | - GROUP_SECURITY_INFORMATION | - DACL_SECURITY_INFORMATION | - SACL_SECURITY_INFORMATION; - - if (ntfs_set_inode_security(ni, selection, - (const char*)sd->descriptors[dentry->security_id])) - { + dentry->d_inode->security_id, dentry->full_path_utf8); + + ret = ntfs_xattr_system_setxattr(&ctx, XATTR_NTFS_ACL, + ni, dir_ni, descriptor, + sd->sizes[dentry->d_inode->security_id], 0); + + if (ret != 0) { ERROR_WITH_ERRNO("Failed to set security data on `%s'", dentry->full_path_utf8); return WIMLIB_ERR_NTFS_3G; @@ -277,9 +286,9 @@ static int apply_reparse_data(ntfs_inode *ni, const struct dentry *dentry, struct lookup_table_entry *lte; int ret = 0; - wimlib_assert(dentry->attributes & FILE_ATTRIBUTE_REPARSE_POINT); + wimlib_assert(dentry->d_inode->attributes & FILE_ATTRIBUTE_REPARSE_POINT); - lte = dentry_unnamed_lte(dentry, w->lookup_table); + lte = inode_unnamed_lte(dentry->d_inode, w->lookup_table); DEBUG("Applying reparse data to `%s'", dentry->full_path_utf8); @@ -297,11 +306,11 @@ static int apply_reparse_data(ntfs_inode *ni, const struct dentry *dentry, u8 reparse_data_buf[8 + wim_resource_size(lte)]; u8 *p = reparse_data_buf; - p = put_u32(p, dentry->reparse_tag); /* ReparseTag */ + p = put_u32(p, dentry->d_inode->reparse_tag); /* ReparseTag */ p = put_u16(p, wim_resource_size(lte)); /* ReparseDataLength */ p = put_u16(p, 0); /* Reserved */ - ret = read_full_wim_resource(lte, p); + ret = read_full_wim_resource(lte, p, 0); if (ret != 0) return ret; @@ -318,7 +327,7 @@ static int apply_reparse_data(ntfs_inode *ni, const struct dentry *dentry, 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, @@ -330,18 +339,14 @@ static int preapply_dentry_with_dos_name(struct dentry *dentry, ntfs_inode **dir_ni_p, WIMStruct *w) { - int ret; struct dentry *other; struct dentry *dentry_with_dos_name; - if (dentry->link_group_list.next == &dentry->link_group_list) - return 0; - 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) { + inode_for_each_dentry(other, dentry->d_inode) { + if (other != dentry && (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", @@ -352,12 +357,11 @@ static int preapply_dentry_with_dos_name(struct dentry *dentry, } } /* If there's a dentry with a DOS name, extract it first */ - if (dentry_with_dos_name - && !dentry_with_dos_name->extracted_file) - { + if (dentry_with_dos_name && !dentry_is_extracted(dentry)) { char *p; const char *dir_name; char orig; + int ret; ntfs_volume *vol = (*dir_ni_p)->vol; DEBUG("pre-applying DOS name `%s'", @@ -386,7 +390,7 @@ static int preapply_dentry_with_dos_name(struct dentry *dentry, return 0; } -/* +/* * Applies a WIM dentry to a NTFS filesystem. * * @dentry: The WIM dentry to apply @@ -403,45 +407,47 @@ static int do_wim_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni, ntfs_inode *ni = NULL; bool is_hardlink = false; ntfs_volume *vol = dir_ni->vol; + struct inode *inode = dentry->d_inode; + dentry->is_extracted = true; - if (dentry->attributes & FILE_ATTRIBUTE_DIRECTORY) { + if (inode->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 */ - ret = preapply_dentry_with_dos_name(dentry, &dir_ni, w); - if (ret != 0) - return ret; + if (dentry->short_name_len == 0) { + ret = preapply_dentry_with_dos_name(dentry, + &dir_ni, w); + if (ret != 0) + return ret; + } type = S_IFREG; - /* 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, + + if (inode->link_count > 1) { + /* Already extracted another dentry in the hard link + * group. We can make a hard link instead of extracting + * the file data. */ + if (inode->extracted_file) { + ret = wim_apply_hardlink_ntfs(dentry, inode, dir_ni, &ni); is_hardlink = true; - if (ret != 0) + if (ret) goto out_close_dir_ni; else goto out_set_dos_name; } - } - /* Can't make a hard link; extract the file itself */ - 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 */ + FREE(inode->extracted_file); + inode->extracted_file = STRDUP(dentry->full_path_utf8); + if (!inode->extracted_file) { + ret = WIMLIB_ERR_NOMEM; + goto out_close_dir_ni; + } } } - /* + /* * Create a directory or file. * * Note: For symbolic links that are not directory junctions, pass @@ -459,19 +465,19 @@ static int do_wim_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni, /* Write the data streams, unless this is a directory or reparse point * */ - if (!dentry_is_directory(dentry) && - !(dentry->attributes & FILE_ATTRIBUTE_REPARSE_POINT)) { + if (!(inode->attributes & (FILE_ATTRIBUTE_REPARSE_POINT | + FILE_ATTRIBUTE_DIRECTORY))) { ret = write_ntfs_data_streams(ni, dentry, w); if (ret != 0) 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_dir_ni; - if (dentry->attributes & FILE_ATTR_REPARSE_POINT) { + if (inode->attributes & FILE_ATTR_REPARSE_POINT) { ret = apply_reparse_data(ni, dentry, w); if (ret != 0) goto out_close_dir_ni; @@ -577,7 +583,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"); @@ -598,7 +604,7 @@ static int wim_apply_dentry_ntfs(struct dentry *dentry, void *arg) char orig; const char *dir_name; - if (dentry->extracted_file) + if (dentry_is_extracted(dentry)) return 0; wimlib_assert(dentry->full_path_utf8); @@ -621,8 +627,6 @@ static int wim_apply_dentry_ntfs(struct dentry *dentry, void *arg) dir_name = dentry->full_path_utf8; dir_ni = ntfs_pathname_to_inode(vol, NULL, dir_name); - if (dir_ni) - DEBUG("Found NTFS inode for `%s'", dir_name); *p = orig; if (!dir_ni) { ERROR_WITH_ERRNO("Could not find NTFS inode for `%s'", @@ -652,9 +656,9 @@ static int wim_apply_dentry_timestamps(struct dentry *dentry, void *arg) } p = buf; - p = put_u64(p, dentry->creation_time); - p = put_u64(p, dentry->last_write_time); - p = put_u64(p, dentry->last_access_time); + p = put_u64(p, dentry->d_inode->creation_time); + p = put_u64(p, dentry->d_inode->last_write_time); + p = put_u64(p, dentry->d_inode->last_access_time); 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'", @@ -671,33 +675,41 @@ static int wim_apply_dentry_timestamps(struct dentry *dentry, void *arg) return ret; } +static int dentry_set_unextracted(struct dentry *dentry, void *ignore) +{ + dentry->is_extracted = false; + 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_set_unextracted, NULL); + ret = for_dentry_in_tree(root, wim_apply_dentry_ntfs, &args); if (ret != 0) goto out; + 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(wim_root_dentry(w), - wim_apply_dentry_timestamps, + 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", @@ -715,7 +727,7 @@ out: } -/* +/* * API entry point for applying a WIM image to a NTFS volume. * * Please note that this is a NTFS *volume* and not a directory. The intention @@ -723,11 +735,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 " @@ -739,16 +758,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; - return do_wim_apply_image_ntfs(w, device, flags); + 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; + } + + ret = select_wim_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; + } + 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");