X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fntfs-apply.c;h=108418b3444c8020b0f2d5f65d7fc2a3a1237e7f;hp=d3457fb894bfc6677a1c75dcaac33cf4a7d5d9a0;hb=239e67483b8d6759fa97f25a65011cc3480368bc;hpb=075e1470621233971f5785ce12e5106f3c0f4d42 diff --git a/src/ntfs-apply.c b/src/ntfs-apply.c index d3457fb8..108418b3 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/. */ @@ -49,9 +48,12 @@ struct ntfs_apply_args { WIMStruct *w; }; -extern int _ntfs_set_file_security(ntfs_inode *ni, u32 selection, + +#ifndef WITH_NEW_NTFS_3G +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 +63,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 +87,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 +121,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 +177,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); @@ -191,7 +242,7 @@ apply_file_attributes_and_security_data(ntfs_inode *ni, { DEBUG("Setting NTFS file attributes on `%s' to %#"PRIx32, dentry->full_path_utf8, dentry->attributes); - if (!_ntfs_set_file_attributes(ni, dentry->attributes)) { + if (ntfs_set_inode_attributes(ni, dentry->attributes)) { ERROR("Failed to set NTFS file attributes on `%s'", dentry->full_path_utf8); return WIMLIB_ERR_NTFS_3G; @@ -209,8 +260,8 @@ apply_file_attributes_and_security_data(ntfs_inode *ni, DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION; - if (!_ntfs_set_file_security(ni, selection, - sd->descriptors[dentry->security_id])) + if (ntfs_set_inode_security(ni, selection, + (const char*)sd->descriptors[dentry->security_id])) { ERROR_WITH_ERRNO("Failed to set security data on `%s'", dentry->full_path_utf8); @@ -228,7 +279,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 +295,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 +305,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'", @@ -299,7 +352,9 @@ 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_with_dos_name->extracted_file) + { char *p; const char *dir_name; char orig; @@ -354,6 +409,8 @@ static int do_wim_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni, } 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; @@ -363,6 +420,9 @@ static int do_wim_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni, 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; @@ -372,7 +432,7 @@ static int do_wim_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni, goto out_set_dos_name; } } - /* Can't make a hard link */ + /* 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) { @@ -496,7 +556,6 @@ out_close_dir_ni: ret = WIMLIB_ERR_NTFS_3G; ERROR_WITH_ERRNO("Failed to close directory inode"); } -out_close_ni: if (ni && ntfs_inode_close(ni) != 0) { if (ret == 0) ret = WIMLIB_ERR_NTFS_3G; @@ -535,10 +594,8 @@ 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) @@ -579,10 +636,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; @@ -600,7 +655,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); @@ -621,6 +676,7 @@ static int do_wim_apply_image_ntfs(WIMStruct *w, const char *device, int extract ntfs_volume *vol; int ret; + DEBUG("Mounting NTFS volume `%s'", device); vol = ntfs_mount(device, 0); if (!vol) { ERROR_WITH_ERRNO("Failed to mount NTFS volume `%s'", device); @@ -636,11 +692,20 @@ static int do_wim_apply_image_ntfs(WIMStruct *w, const char *device, int extract if (ret != 0) goto out; - DEBUG("Setting NTFS 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(wim_root_dentry(w), 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) @@ -678,16 +743,6 @@ WIMLIBAPI int wimlib_apply_image_to_ntfs_volume(WIMStruct *w, int image, 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."); - - return WIMLIB_ERR_NOT_ROOT; - } -#endif return do_wim_apply_image_ntfs(w, device, flags); }