X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fntfs-apply.c;h=c00be57fe743e9740b884b81066ea7a0f8aaf38d;hp=56b3e70128a4c3934abb1b0cef7c02d530ad95fd;hb=4f844f1d4777cc2ee957fad04c399880e5757083;hpb=d0e7f039e4ab206b9fd973c983e3fb841fcd2bf2 diff --git a/src/ntfs-apply.c b/src/ntfs-apply.c index 56b3e701..c00be57f 100644 --- a/src/ntfs-apply.c +++ b/src/ntfs-apply.c @@ -1,8 +1,9 @@ /* * ntfs-apply.c * - * Apply a WIM image to a NTFS volume. We restore everything we can, including - * security data and alternate data streams. + * Apply a WIM image to a NTFS volume. Restore as much information as possible, + * including security data, file attributes, DOS names, and alternate data + * streams. */ /* @@ -27,32 +28,31 @@ #include "config.h" -#ifdef WITH_NTFS_3G #include #include -#endif #include "wimlib_internal.h" - - -#ifdef WITH_NTFS_3G +#include "buffer_io.h" #include "dentry.h" #include "lookup_table.h" -#include "io.h" -#include -#include + #include #include /* security.h before xattrs.h */ -#include #include -#include -#include +#include +#include -struct ntfs_apply_args { - ntfs_volume *vol; - int extract_flags; - WIMStruct *w; -}; +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. @@ -61,67 +61,43 @@ 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 +/* Writes the data streams of a WIM inode to the data attributes of a NTFS + * inode. * - * @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. + * @ni: The NTFS inode to which the streams are to be extracted. + * + * @dentry: The WIM dentry being extracted. The @d_inode member points to the + * corresponding WIM inode that contains the streams being extracted. + * The WIM dentry itself is only needed to provide a file path for + * better error messages. + * + * @progress_info: Progress information for the image application. The number + * of extracted bytes will be incremented by the uncompressed + * size of each stream extracted. * * Returns 0 on success, nonzero on failure. */ static int write_ntfs_data_streams(ntfs_inode *ni, const struct dentry *dentry, - WIMStruct *w) + union wimlib_progress_info *progress_info) { int ret = 0; unsigned stream_idx = 0; ntfschar *stream_name = AT_UNNAMED; u32 stream_name_len = 0; const struct inode *inode = dentry->d_inode; + struct lookup_table_entry *lte; DEBUG("Writing %u NTFS data stream%s for `%s'", inode->num_ads + 1, (inode->num_ads == 0 ? "" : "s"), dentry->full_path_utf8); + lte = inode->lte; while (1) { - struct lookup_table_entry *lte; - ntfs_attr *na; - - lte = inode_stream_lte(inode, stream_idx, w->lookup_table); - if (stream_name_len) { /* Create an empty named stream. */ ret = ntfs_attr_add(ni, AT_DATA, stream_name, @@ -136,10 +112,12 @@ static int write_ntfs_data_streams(ntfs_inode *ni, const struct dentry *dentry, } } + /* If there's no lookup table entry, it's an empty stream. - * Otherwise, we must open the attribute and extract the data. - * */ + * Otherwise, open the attribute and extract the data. */ if (lte) { + ntfs_attr *na; + na = ntfs_attr_open(ni, AT_DATA, stream_name, stream_name_len); if (!na) { ERROR_WITH_ERRNO("Failed to open a data stream of " @@ -148,52 +126,97 @@ static int write_ntfs_data_streams(ntfs_inode *ni, const struct dentry *dentry, ret = WIMLIB_ERR_NTFS_3G; break; } + + /* The WIM lookup table entry provides the stream + * length, so the NTFS attribute should be resized to + * this length before starting to extract the data. */ + ret = ntfs_attr_truncate_solid(na, wim_resource_size(lte)); + if (ret != 0) { + ntfs_attr_close(na); + break; + } + + /* Actually extract the stream */ ret = extract_wim_resource_to_ntfs_attr(lte, na); + + /* Close the attribute */ + ntfs_attr_close(na); if (ret != 0) break; - ntfs_attr_close(na); + + /* Record the number of bytes of uncompressed data that + * have been extracted. */ + progress_info->extract.completed_bytes += wim_resource_size(lte); } - if (stream_idx == inode->num_ads) + if (stream_idx == inode->num_ads) /* Has the last stream been extracted? */ break; + + /* Get the name and lookup table entry for the next stream. */ stream_name = (ntfschar*)inode->ads_entries[stream_idx].stream_name; stream_name_len = inode->ads_entries[stream_idx].stream_name_len / 2; + lte = inode->ads_entries[stream_idx].lte; stream_idx++; } return ret; } +/* Open the NTFS inode that corresponds to the parent of a WIM dentry. Returns + * the opened inode, or NULL on failure. */ +static ntfs_inode *dentry_open_parent_ni(const struct dentry *dentry, + ntfs_volume *vol) +{ + char *p; + const char *dir_name; + ntfs_inode *dir_ni; + char orig; + + 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); + if (!dir_ni) { + ERROR_WITH_ERRNO("Could not find NTFS inode for `%s'", + dir_name); + } + *p = orig; + return dir_ni; +} + /* - * Makes a NTFS hard link + * Makes a NTFS hard link. * - * 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 @inode->extracted_file. + * The hard link 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 @inode->extracted_file. + * + * Or, in other words, this adds a new name @from_dentry->full_path_utf8 to an + * existing NTFS inode which already has a name @inode->extracted_file. * * 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_ntfs_hardlink(const struct dentry *from_dentry, + const struct inode *inode, + ntfs_inode **dir_ni_p) { int ret; - char *p; - char orig; - const char *dir_name; - ntfs_inode *to_ni; + ntfs_inode *dir_ni; ntfs_volume *vol; - wimlib_assert(dentry_is_regular_file(from_dentry) - && inode_is_regular_file(inode)); - - if (ntfs_inode_close(dir_ni) != 0) { + dir_ni = *dir_ni_p; + vol = dir_ni->vol; + ret = ntfs_inode_close(dir_ni); + *dir_ni_p = NULL; + if (ret != 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, inode->extracted_file); @@ -203,49 +226,55 @@ static int wim_apply_hardlink_ntfs(const struct dentry *from_dentry, inode->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); + dir_ni = dentry_open_parent_ni(from_dentry, vol); if (!dir_ni) { - ERROR_WITH_ERRNO("Could not find NTFS inode for `%s'", - from_dentry->full_path_utf8); - *p = orig; + ntfs_inode_close(to_ni); return WIMLIB_ERR_NTFS_3G; } - *p = orig; + + *dir_ni_p = dir_ni; ret = ntfs_link(to_ni, dir_ni, (ntfschar*)from_dentry->file_name, from_dentry->file_name_len / 2); - if (ret != 0) { + if (ntfs_inode_close_in_dir(to_ni, dir_ni) || ret != 0) { ERROR_WITH_ERRNO("Could not create hard link `%s' => `%s'", from_dentry->full_path_utf8, inode->extracted_file); ret = WIMLIB_ERR_NTFS_3G; } - *to_ni_ret = to_ni; return ret; } +/* Transfers file attributes and possibly a security descriptor from a WIM inode + * to a NTFS inode. + * + * @ni: The NTFS inode to apply the metadata to. + * @dir_ni: The NTFS inode for a directory containing @ni. + * @dentry: The WIM dentry whose inode contains the metadata to apply. + * @w: The WIMStruct for the WIM, through which the table of security + * descriptors can be accessed. + * + * Returns 0 on success, nonzero on failure. + */ 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->d_inode->attributes); int ret; struct SECURITY_CONTEXT ctx; u32 attributes_le32; - attributes_le32 = cpu_to_le32(dentry->d_inode->attributes); + const struct inode *inode; + + inode = dentry->d_inode; + + DEBUG("Setting NTFS file attributes on `%s' to %#"PRIx32, + dentry->full_path_utf8, inode->attributes); + + attributes_le32 = cpu_to_le32(inode->attributes); memset(&ctx, 0, sizeof(ctx)); ctx.vol = ni->vol; ret = ntfs_xattr_system_setxattr(&ctx, XATTR_NTFS_ATTRIB, @@ -257,19 +286,19 @@ apply_file_attributes_and_security_data(ntfs_inode *ni, dentry->full_path_utf8); return WIMLIB_ERR_NTFS_3G; } - if (dentry->d_inode->security_id != -1) { + if (inode->security_id != -1) { + const char *desc; const struct wim_security_data *sd; - const char *descriptor; sd = wim_const_security_data(w); - wimlib_assert(dentry->d_inode->security_id < sd->num_entries); - descriptor = sd->descriptors[dentry->d_inode->security_id]; + wimlib_assert(inode->security_id < sd->num_entries); + desc = (const char *)sd->descriptors[inode->security_id]; DEBUG("Applying security descriptor %d to `%s'", - dentry->d_inode->security_id, dentry->full_path_utf8); + 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); + ni, dir_ni, desc, + sd->sizes[inode->security_id], 0); if (ret != 0) { ERROR_WITH_ERRNO("Failed to set security data on `%s'", @@ -280,15 +309,17 @@ apply_file_attributes_and_security_data(ntfs_inode *ni, return 0; } +/* + * Transfers the reparse data from a WIM inode (which must represent a reparse + * point) to a NTFS inode. + */ static int apply_reparse_data(ntfs_inode *ni, const struct dentry *dentry, - const WIMStruct *w) + union wimlib_progress_info *progress_info) { struct lookup_table_entry *lte; int ret = 0; - wimlib_assert(dentry->d_inode->attributes & FILE_ATTRIBUTE_REPARSE_POINT); - - lte = inode_unnamed_lte(dentry->d_inode, w->lookup_table); + lte = inode_unnamed_lte_resolved(dentry->d_inode); DEBUG("Applying reparse data to `%s'", dentry->full_path_utf8); @@ -299,7 +330,7 @@ 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; } @@ -310,7 +341,7 @@ static int apply_reparse_data(ntfs_inode *ni, const struct dentry *dentry, 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; @@ -321,11 +352,12 @@ static int apply_reparse_data(ntfs_inode *ni, const struct dentry *dentry, dentry->full_path_utf8); return WIMLIB_ERR_NTFS_3G; } + progress_info->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 @@ -337,7 +369,7 @@ 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; @@ -357,7 +389,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; @@ -366,26 +398,14 @@ 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; - 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); + + *dir_ni_p = dentry_open_parent_ni(dentry, vol); + if (!*dir_ni_p) return WIMLIB_ERR_NTFS_3G; - } } return 0; } @@ -395,71 +415,70 @@ static int preapply_dentry_with_dos_name(struct dentry *dentry, * * @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->d_inode; - dentry->is_extracted = true; + dentry->is_extracted = 1; 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 this dentry is hard-linked to any other dentries in the + * same directory, make sure to apply the one (if any) with a + * DOS name first. Otherwise, NTFS-3g might not assign the file + * names correctly. */ if (dentry->short_name_len == 0) { ret = preapply_dentry_with_dos_name(dentry, - &dir_ni, w); + &dir_ni, args); if (ret != 0) return ret; } - type = S_IFREG; - 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. */ + /* Inode has multiple dentries referencing it. */ + if (inode->extracted_file) { - ret = wim_apply_hardlink_ntfs(dentry, inode, - dir_ni, &ni); - is_hardlink = true; - if (ret) - goto out_close_dir_ni; - else + /* Already extracted another dentry in the hard + * link group. Make a hard link instead of + * extracting the file data. */ + ret = apply_ntfs_hardlink(dentry, inode, + &dir_ni); + if (ret == 0) 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) { - ret = WIMLIB_ERR_NOMEM; - goto out_close_dir_ni; + else + goto out_close_dir_ni; + } else { + /* None of the dentries of this inode have been + * extracted yet, so go ahead and extract the + * first one. */ + 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. + /* Create a NTFS directory or file. * - * Note: For symbolic links that are not directory junctions, pass - * S_IFREG here, since we manually set the reparse data later. - */ + * Note: For symbolic links that are not directory junctions, S_IFREG is + * passed here, since the reparse data and file attributes are set + * later. */ ni = ntfs_create(dir_ni, 0, (ntfschar*)dentry->file_name, dentry->file_name_len / 2, type); if (!ni) { - ERROR_WITH_ERRNO("Could not create NTFS object for `%s'", + ERROR_WITH_ERRNO("Could not create NTFS inode for `%s'", dentry->full_path_utf8); ret = WIMLIB_ERR_NTFS_3G; goto out_close_dir_ni; @@ -469,18 +488,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->progress); 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->progress); if (ret != 0) goto out_close_dir_ni; } @@ -491,55 +511,24 @@ out_set_dos_name: char *short_name_utf8; size_t short_name_utf8_len; - short_name_utf8 = utf16_to_utf8(dentry->short_name, - dentry->short_name_len, - &short_name_utf8_len); - if (!short_name_utf8) { - ERROR("Out of memory"); - ret = WIMLIB_ERR_NOMEM; + ret = utf16_to_utf8(dentry->short_name, + dentry->short_name_len, + &short_name_utf8, + &short_name_utf8_len); + if (ret != 0) goto out_close_dir_ni; - } - - 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; - } + if (!ni) { + /* Hardlink was made; linked inode needs to be looked up + * again. */ ni = ntfs_pathname_to_inode(vol, dir_ni, dentry->file_name_utf8); if (!ni) { ERROR_WITH_ERRNO("Could not find NTFS inode for `%s'", - dir_name); - return WIMLIB_ERR_NTFS_3G; + dentry->full_path_utf8); + FREE(short_name_utf8); + ret = WIMLIB_ERR_NTFS_3G; + goto out_close_dir_ni; } } @@ -559,27 +548,33 @@ out_set_dos_name: } 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"); - } - if (ni && ntfs_inode_close(ni) != 0) { - if (ret == 0) - ret = WIMLIB_ERR_NTFS_3G; - ERROR_WITH_ERRNO("Failed to close inode"); + if (dir_ni) { + if (ni) { + if (ntfs_inode_close_in_dir(ni, dir_ni)) { + if (ret == 0) + ret = WIMLIB_ERR_NTFS_3G; + ERROR_WITH_ERRNO("Failed to close inode for `%s'", + dentry->full_path_utf8); + } + } + if (ntfs_inode_close(dir_ni)) { + if (ret == 0) + ret = WIMLIB_ERR_NTFS_3G; + ERROR_WITH_ERRNO("Failed to close inode of directory " + "containing `%s'", dentry->full_path_utf8); + } + } else { + wimlib_assert(ni == NULL); } 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; - wimlib_assert(dentry_is_directory(dentry)); ni = ntfs_pathname_to_inode(vol, NULL, "/"); if (!ni) { ERROR_WITH_ERRNO("Could not find root NTFS inode"); @@ -595,58 +590,33 @@ 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; - ntfs_volume *vol = args->vol; - int extract_flags = args->extract_flags; - WIMStruct *w = args->w; + struct apply_args *args = arg; + ntfs_volume *vol = args->vol; + WIMStruct *w = args->w; ntfs_inode *dir_ni; - char *p; - char orig; - const char *dir_name; - - if (dentry_is_extracted(dentry)) - return 0; - - wimlib_assert(dentry->full_path_utf8); - - DEBUG("Applying dentry `%s' to NTFS", dentry->full_path_utf8); - - if (extract_flags & WIMLIB_EXTRACT_FLAG_VERBOSE) - puts(dentry->full_path_utf8); 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 { - 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); + dir_ni = dentry_open_parent_ni(dentry, vol); + if (dir_ni) + return do_apply_dentry_ntfs(dentry, dir_ni, arg); + else return WIMLIB_ERR_NTFS_3G; - } - return do_wim_apply_dentry_ntfs(dentry, dir_ni, w); } -static int wim_apply_dentry_timestamps(struct dentry *dentry, void *arg) +/* Transfers the 100-nanosecond precision timestamps from a WIM dentry to a NTFS + * inode */ +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; - + int ret; DEBUG("Setting timestamps on `%s'", dentry->full_path_utf8); @@ -676,126 +646,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 = 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, - 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 */