X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fntfs-apply.c;h=3f4157d7074f694a0f230456894d958833ae0ebd;hb=89198eafbaf6afac99dc74f77753466f9c1bc7f0;hp=ee1982af7f63d610676f59363fede5d46b94650e;hpb=40de13bf883e1cc67612a6d36a02fd76ee2853d0;p=wimlib diff --git a/src/ntfs-apply.c b/src/ntfs-apply.c index ee1982af..3f4157d7 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 @@ -49,7 +55,7 @@ struct ntfs_apply_args { }; -#ifndef WITH_NEW_NTFS_3G +#if 0 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); @@ -98,7 +104,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 +116,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 +160,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 +174,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 +192,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 +202,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 +234,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 +243,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 = 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; + 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 (ntfs_set_inode_security(ni, selection, - (const char*)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; @@ -277,9 +293,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,7 +313,7 @@ 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 */ @@ -334,10 +350,10 @@ static int preapply_dentry_with_dos_name(struct dentry *dentry, 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) { + 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", @@ -348,9 +364,7 @@ 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; @@ -400,8 +414,10 @@ 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; @@ -416,26 +432,26 @@ static int do_wim_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni, } 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) { + if (ret) goto out_close_dir_ni; - } else { - dentry->extracted_file = dentry->full_path_utf8; + else goto out_set_dos_name; - } } + /* 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) + return WIMLIB_ERR_NOMEM; } - /* Can't make a hard link; extract the file itself */ - dentry->extracted_file = dentry->full_path_utf8; } /* @@ -456,19 +472,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; @@ -574,7 +590,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"); @@ -595,7 +611,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); @@ -647,9 +663,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'", @@ -666,11 +682,9 @@ static int wim_apply_dentry_timestamps(struct dentry *dentry, void *arg) return ret; } -static int dentry_clear_extracted_file(struct dentry *dentry, void *ignore) +static int dentry_set_unextracted(struct dentry *dentry, void *ignore) { - if (dentry->extracted_file != dentry->full_path_utf8) - FREE(dentry->extracted_file); - dentry->extracted_file = NULL; + dentry->is_extracted = false; return 0; } @@ -692,8 +706,7 @@ static int do_wim_apply_image_ntfs(WIMStruct *w, const char *device, int extract args.w = w; root = wim_root_dentry(w); - for_dentry_in_tree(root, dentry_clear_extracted_file, NULL); - + 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; @@ -729,11 +742,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 " @@ -745,16 +765,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 = 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; + } + 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");