X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fntfs-apply.c;h=f1ff0dd1adc6f28713b496ba35b826e9902c03fb;hp=9628e25edafa0bb890f1b473f002be2d1f0ae9a2;hb=36a737d734cdc6c6eb0ce9da3183a1f8fa4288e6;hpb=50670821723291959a6f35442c523800d369c934 diff --git a/src/ntfs-apply.c b/src/ntfs-apply.c index 9628e25e..f1ff0dd1 100644 --- a/src/ntfs-apply.c +++ b/src/ntfs-apply.c @@ -27,18 +27,14 @@ #include "config.h" -#ifdef WITH_NTFS_3G + #include #include -#endif #include "wimlib_internal.h" - - -#ifdef WITH_NTFS_3G #include "dentry.h" #include "lookup_table.h" -#include "io.h" +#include "buffer_io.h" #include #include #include @@ -48,75 +44,44 @@ #include #include -struct ntfs_apply_args { - ntfs_volume *vol; - int extract_flags; - WIMStruct *w; -}; - - -#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); -#endif +static int extract_wim_chunk_to_ntfs_attr(const u8 *buf, size_t len, + u64 offset, void *arg) +{ + ntfs_attr *na = arg; + if (ntfs_attr_pwrite(na, offset, len, buf) == len) { + return 0; + } else { + ERROR_WITH_ERRNO("Error extracting WIM resource to NTFS attribute"); + return WIMLIB_ERR_WRITE; + } +} -/* +/* * Extracts a WIM resource to a NTFS attribute. */ static int extract_wim_resource_to_ntfs_attr(const struct lookup_table_entry *lte, ntfs_attr *na) { - u64 bytes_remaining = wim_resource_size(lte); - u8 buf[min(WIM_CHUNK_SIZE, bytes_remaining)]; - u64 offset = 0; - int ret = 0; - u8 hash[SHA1_HASH_SIZE]; - - SHA_CTX ctx; - sha1_init(&ctx); - - while (bytes_remaining) { - u64 to_read = min(bytes_remaining, WIM_CHUNK_SIZE); - ret = read_wim_resource(lte, buf, to_read, offset, false); - if (ret != 0) - break; - sha1_update(&ctx, buf, to_read); - if (ntfs_attr_pwrite(na, offset, to_read, buf) != to_read) { - ERROR_WITH_ERRNO("Error extracting WIM resource"); - return WIMLIB_ERR_WRITE; - } - bytes_remaining -= to_read; - offset += to_read; - } - sha1_final(hash, &ctx); - if (!hashes_equal(hash, lte->hash)) { - ERROR("Invalid checksum on a WIM resource " - "(detected when extracting to NTFS stream)"); - ERROR("The following WIM resource is invalid:"); - print_lookup_table_entry(lte); - return WIMLIB_ERR_INVALID_RESOURCE_HASH; - } - return 0; + return extract_wim_resource(lte, wim_resource_size(lte), + extract_wim_chunk_to_ntfs_attr, na); } /* Writes the data streams to a NTFS file * * @ni: The NTFS inode for the 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. */ static int write_ntfs_data_streams(ntfs_inode *ni, const struct dentry *dentry, - WIMStruct *w) + struct apply_args *args) { int ret = 0; unsigned stream_idx = 0; ntfschar *stream_name = AT_UNNAMED; u32 stream_name_len = 0; - const struct inode *inode = dentry->inode; + const struct inode *inode = dentry->d_inode; DEBUG("Writing %u NTFS data stream%s for `%s'", inode->num_ads + 1, @@ -127,7 +92,7 @@ static int write_ntfs_data_streams(ntfs_inode *ni, const struct dentry *dentry, struct lookup_table_entry *lte; ntfs_attr *na; - lte = inode_stream_lte(inode, stream_idx, w->lookup_table); + lte = inode_stream_lte_resolved(inode, stream_idx); if (stream_name_len) { /* Create an empty named stream. */ @@ -158,6 +123,7 @@ static int write_ntfs_data_streams(ntfs_inode *ni, const struct dentry *dentry, ret = extract_wim_resource_to_ntfs_attr(lte, na); if (ret != 0) break; + args->progress.extract.completed_bytes += wim_resource_size(lte); ntfs_attr_close(na); } if (stream_idx == inode->num_ads) @@ -178,10 +144,10 @@ static int write_ntfs_data_streams(ntfs_inode *ni, const struct dentry *dentry, * * Return 0 on success, nonzero on failure. */ -static int wim_apply_hardlink_ntfs(const struct dentry *from_dentry, - const struct inode *inode, - ntfs_inode *dir_ni, - ntfs_inode **to_ni_ret) +static int apply_hardlink_ntfs(const struct dentry *from_dentry, + const struct inode *inode, + ntfs_inode *dir_ni, + ntfs_inode **to_ni_ret) { int ret; char *p; @@ -248,11 +214,11 @@ apply_file_attributes_and_security_data(ntfs_inode *ni, const WIMStruct *w) { DEBUG("Setting NTFS file attributes on `%s' to %#"PRIx32, - dentry->full_path_utf8, dentry->inode->attributes); + dentry->full_path_utf8, dentry->d_inode->attributes); int ret; struct SECURITY_CONTEXT ctx; u32 attributes_le32; - attributes_le32 = cpu_to_le32(dentry->inode->attributes); + 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, @@ -264,20 +230,20 @@ apply_file_attributes_and_security_data(ntfs_inode *ni, dentry->full_path_utf8); return WIMLIB_ERR_NTFS_3G; } - if (dentry->inode->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->inode->security_id < sd->num_entries); - descriptor = sd->descriptors[dentry->inode->security_id]; + 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->inode->security_id, dentry->full_path_utf8); + 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->inode->security_id], 0); - + 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); @@ -288,14 +254,12 @@ apply_file_attributes_and_security_data(ntfs_inode *ni, } static int apply_reparse_data(ntfs_inode *ni, const struct dentry *dentry, - const WIMStruct *w) + struct apply_args *args) { struct lookup_table_entry *lte; int ret = 0; - wimlib_assert(dentry->inode->attributes & FILE_ATTRIBUTE_REPARSE_POINT); - - lte = inode_unnamed_lte(dentry->inode, w->lookup_table); + lte = inode_unnamed_lte_resolved(dentry->d_inode); DEBUG("Applying reparse data to `%s'", dentry->full_path_utf8); @@ -306,18 +270,18 @@ static int apply_reparse_data(ntfs_inode *ni, const struct dentry *dentry, } if (wim_resource_size(lte) >= 0xffff) { - ERROR("Reparse data of `%s' is too long (%lu bytes)", + ERROR("Reparse data of `%s' is too long (%"PRIu64" bytes)", dentry->full_path_utf8, wim_resource_size(lte)); return WIMLIB_ERR_INVALID_DENTRY; } u8 reparse_data_buf[8 + wim_resource_size(lte)]; u8 *p = reparse_data_buf; - p = put_u32(p, dentry->inode->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; @@ -328,13 +292,14 @@ static int apply_reparse_data(ntfs_inode *ni, const struct dentry *dentry, dentry->full_path_utf8); return WIMLIB_ERR_NTFS_3G; } + args->progress.extract.completed_bytes += wim_resource_size(lte); return 0; } -static int do_wim_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni, - WIMStruct *w); +static int do_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni, + struct apply_args *args); -/* +/* * 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, @@ -344,13 +309,13 @@ static int do_wim_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni, */ static int preapply_dentry_with_dos_name(struct dentry *dentry, ntfs_inode **dir_ni_p, - WIMStruct *w) + struct apply_args *args) { struct dentry *other; struct dentry *dentry_with_dos_name; dentry_with_dos_name = NULL; - inode_for_each_dentry(other, dentry->inode) { + inode_for_each_dentry(other, dentry->d_inode) { if (other != dentry && (dentry->parent == other->parent) && other->short_name_len) { @@ -364,7 +329,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_is_extracted(dentry)) { + if (dentry_with_dos_name && !dentry_with_dos_name->is_extracted) { char *p; const char *dir_name; char orig; @@ -373,8 +338,8 @@ static int preapply_dentry_with_dos_name(struct dentry *dentry, 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); + ret = do_apply_dentry_ntfs(dentry_with_dos_name, + *dir_ni_p, args); if (ret != 0) return ret; p = dentry->full_path_utf8 + dentry->full_path_utf8_len; @@ -397,36 +362,33 @@ 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 * @dir_ni: The NTFS inode for the parent directory - * @w: The WIMStruct for the WIM containing the image we are applying. * * @return: 0 on success; nonzero on failure. */ -static int do_wim_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni, - WIMStruct *w) +static int do_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni, + struct apply_args *args) { int ret = 0; mode_t type; ntfs_inode *ni = NULL; bool is_hardlink = false; ntfs_volume *vol = dir_ni->vol; - struct inode *inode = dentry->inode; + struct inode *inode = dentry->d_inode; dentry->is_extracted = true; 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 */ if (dentry->short_name_len == 0) { ret = preapply_dentry_with_dos_name(dentry, - &dir_ni, w); + &dir_ni, args); if (ret != 0) return ret; } @@ -438,8 +400,8 @@ static int do_wim_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni, * 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); + ret = apply_hardlink_ntfs(dentry, inode, + dir_ni, &ni); is_hardlink = true; if (ret) goto out_close_dir_ni; @@ -449,12 +411,14 @@ static int do_wim_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni, /* 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; + 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 @@ -474,18 +438,19 @@ static int do_wim_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni, * */ if (!(inode->attributes & (FILE_ATTRIBUTE_REPARSE_POINT | FILE_ATTRIBUTE_DIRECTORY))) { - ret = write_ntfs_data_streams(ni, dentry, w); + ret = write_ntfs_data_streams(ni, dentry, args); if (ret != 0) goto out_close_dir_ni; } - ret = apply_file_attributes_and_security_data(ni, dir_ni, dentry, w); + ret = apply_file_attributes_and_security_data(ni, dir_ni, + dentry, args->w); if (ret != 0) goto out_close_dir_ni; if (inode->attributes & FILE_ATTR_REPARSE_POINT) { - ret = apply_reparse_data(ni, dentry, w); + ret = apply_reparse_data(ni, dentry, args); if (ret != 0) goto out_close_dir_ni; } @@ -577,9 +542,8 @@ out_close_dir_ni: return ret; } -static int wim_apply_root_dentry_ntfs(const struct dentry *dentry, - ntfs_volume *vol, - const WIMStruct *w) +static int apply_root_dentry_ntfs(const struct dentry *dentry, + ntfs_volume *vol, const WIMStruct *w) { ntfs_inode *ni; int ret = 0; @@ -600,9 +564,9 @@ static int wim_apply_root_dentry_ntfs(const struct dentry *dentry, } /* Applies a WIM dentry to the NTFS volume */ -static int wim_apply_dentry_ntfs(struct dentry *dentry, void *arg) +int apply_dentry_ntfs(struct dentry *dentry, void *arg) { - struct ntfs_apply_args *args = arg; + struct apply_args *args = arg; ntfs_volume *vol = args->vol; int extract_flags = args->extract_flags; WIMStruct *w = args->w; @@ -611,18 +575,25 @@ static int wim_apply_dentry_ntfs(struct dentry *dentry, void *arg) char orig; const char *dir_name; - if (dentry_is_extracted(dentry)) + if (dentry->is_extracted) return 0; - wimlib_assert(dentry->full_path_utf8); + if (extract_flags & WIMLIB_EXTRACT_FLAG_NO_STREAMS) + if (inode_unnamed_lte_resolved(dentry->d_inode)) + return 0; DEBUG("Applying dentry `%s' to NTFS", dentry->full_path_utf8); - if (extract_flags & WIMLIB_EXTRACT_FLAG_VERBOSE) - puts(dentry->full_path_utf8); + if ((extract_flags & WIMLIB_EXTRACT_FLAG_VERBOSE) && + args->progress_func) + { + args->progress.extract.cur_path = dentry->full_path_utf8; + args->progress_func(WIMLIB_PROGRESS_MSG_EXTRACT_DENTRY, + &args->progress); + } if (dentry_is_root(dentry)) - return wim_apply_root_dentry_ntfs(dentry, vol, w); + return apply_root_dentry_ntfs(dentry, vol, w); p = dentry->full_path_utf8 + dentry->full_path_utf8_len; do { @@ -640,19 +611,18 @@ static int wim_apply_dentry_ntfs(struct dentry *dentry, void *arg) dir_name); return WIMLIB_ERR_NTFS_3G; } - return do_wim_apply_dentry_ntfs(dentry, dir_ni, w); + return do_apply_dentry_ntfs(dentry, dir_ni, arg); } -static int wim_apply_dentry_timestamps(struct dentry *dentry, void *arg) +int apply_dentry_timestamps_ntfs(struct dentry *dentry, void *arg) { - struct ntfs_apply_args *args = arg; - ntfs_volume *vol = args->vol; + struct apply_args *args = arg; + ntfs_volume *vol = args->vol; u8 *p; u8 buf[24]; ntfs_inode *ni; int ret = 0; - DEBUG("Setting timestamps on `%s'", dentry->full_path_utf8); ni = ntfs_pathname_to_inode(vol, NULL, dentry->full_path_utf8); @@ -663,9 +633,9 @@ static int wim_apply_dentry_timestamps(struct dentry *dentry, void *arg) } p = buf; - p = put_u64(p, dentry->inode->creation_time); - p = put_u64(p, dentry->inode->last_write_time); - p = put_u64(p, dentry->inode->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'", @@ -681,126 +651,3 @@ 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; - } - 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(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) - ret = WIMLIB_ERR_NTFS_3G; - } - return ret; -} - - -/* - * 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 - * is that the volume contain an empty filesystem, and the WIM image contain a - * 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, - WIMStruct **additional_swms, - unsigned num_additional_swms) -{ - struct lookup_table *joined_tab, *w_tab_save; - int ret; - - 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 " - "directly to a NTFS volume"); - return WIMLIB_ERR_INVALID_PARAM; - } - if (flags & (WIMLIB_EXTRACT_FLAG_SYMLINK | WIMLIB_EXTRACT_FLAG_HARDLINK)) { - ERROR("Cannot specify symlink or hardlink flags when applying "); - ERROR("directly to a NTFS volume"); - return WIMLIB_ERR_INVALID_PARAM; - } - - 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; - } - - 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, - 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"); - return WIMLIB_ERR_UNSUPPORTED; -} -#endif /* WITH_NTFS_3G */