X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fntfs-apply.c;h=f1ff0dd1adc6f28713b496ba35b826e9902c03fb;hp=300c30819af778f2fff1ec4543e7e2940c0ac833;hb=36a737d734cdc6c6eb0ce9da3183a1f8fa4288e6;hpb=01efbb02603508a2272f859c87ec259560aa823d diff --git a/src/ntfs-apply.c b/src/ntfs-apply.c index 300c3081..f1ff0dd1 100644 --- a/src/ntfs-apply.c +++ b/src/ntfs-apply.c @@ -1,135 +1,429 @@ +/* + * ntfs-apply.c + * + * Apply a WIM image to a NTFS volume. We restore everything we can, including + * security data and alternate data streams. + */ + /* * Copyright (C) 2012 Eric Biggers * * 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/. */ + #include "config.h" -#include "wimlib_internal.h" -#ifdef WITH_NTFS_3G +#include +#include + +#include "wimlib_internal.h" #include "dentry.h" #include "lookup_table.h" +#include "buffer_io.h" #include #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; + } +} -extern int _ntfs_set_file_security(ntfs_volume *vol, ntfs_inode *ni, - u32 selection, const char *attr); -extern int _ntfs_set_file_attributes(ntfs_inode *ni, s32 attrib); +/* + * 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) +{ + return extract_wim_resource(lte, wim_resource_size(lte), + extract_wim_chunk_to_ntfs_attr, na); +} -static int extract_resource_to_ntfs_attr(WIMStruct *w, const struct resource_entry *entry, - 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. + * + * Returns 0 on success, nonzero on failure. + */ +static int write_ntfs_data_streams(ntfs_inode *ni, const struct dentry *dentry, + struct apply_args *args) { - u8 buf[min(entry->original_size, WIM_CHUNK_SIZE)]; - u64 num_chunks = (entry->original_size + WIM_CHUNK_SIZE - 1) / WIM_CHUNK_SIZE; - u64 n = WIM_CHUNK_SIZE; - int res_ctype = wim_resource_compression_type(w, entry); - u64 offset = 0; - for (u64 i = 0; i < num_chunks; i++) { - DEBUG("Write chunk %u of %u", i + 1, num_chunks); - int ret; - if (i == num_chunks - 1) { - n = entry->original_size % WIM_CHUNK_SIZE; - if (n == 0) { - n = WIM_CHUNK_SIZE; + int ret = 0; + 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'", + inode->num_ads + 1, + (inode->num_ads == 0 ? "" : "s"), + dentry->full_path_utf8); + + while (1) { + struct lookup_table_entry *lte; + ntfs_attr *na; + + lte = inode_stream_lte_resolved(inode, stream_idx); + + 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 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); + if (ret != 0) + break; + args->progress.extract.completed_bytes += wim_resource_size(lte); + ntfs_attr_close(na); + } + if (stream_idx == inode->num_ads) + break; + 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; +} - ret = read_resource(w->fp, entry->size, entry->original_size, - entry->offset, res_ctype, n, offset, buf); - if (ret != 0) - return ret; +/* + * 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. + * + * Return 0 on success, nonzero on failure. + */ +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; + char orig; + const char *dir_name; + + ntfs_inode *to_ni; + ntfs_volume *vol; + + wimlib_assert(dentry_is_regular_file(from_dentry) + && inode_is_regular_file(inode)); + + 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, inode->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'", + 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); + 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); + if (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; +} + +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); + 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->d_inode->security_id != -1) { + 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 = (const char *)sd->descriptors[dentry->d_inode->security_id]; + DEBUG("Applying security descriptor %d to `%s'", + dentry->d_inode->security_id, dentry->full_path_utf8); - if (ntfs_attr_pwrite(na, offset, n, buf) != n) { - ERROR("Failed to write to NTFS data stream"); - return WIMLIB_ERR_WRITE; + 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; } - offset += n; } return 0; } -static int write_ntfs_data_streams(ntfs_inode *ni, const struct dentry *dentry, - WIMStruct *w) +static int apply_reparse_data(ntfs_inode *ni, const struct dentry *dentry, + struct apply_args *args) { - ntfs_attr *na; struct lookup_table_entry *lte; - int ret; + int ret = 0; + lte = inode_unnamed_lte_resolved(dentry->d_inode); - DEBUG("Writing NTFS data streams for `%s'", dentry->full_path_utf8); + DEBUG("Applying reparse data to `%s'", dentry->full_path_utf8); - wimlib_assert(dentry->num_ads == 0); + if (!lte) { + ERROR("Could not find reparse data for `%s'", + dentry->full_path_utf8); + return WIMLIB_ERR_INVALID_DENTRY; + } - lte = dentry_stream_lte(dentry, 0, w->lookup_table); - if (lte && lte->resource_entry.original_size != 0) { + if (wim_resource_size(lte) >= 0xffff) { + ERROR("Reparse data of `%s' is too long (%"PRIu64" bytes)", + dentry->full_path_utf8, wim_resource_size(lte)); + return WIMLIB_ERR_INVALID_DENTRY; + } - na = ntfs_attr_open(ni, AT_DATA, AT_UNNAMED, 0); - if (!na) { - ERROR_WITH_ERRNO("Failed to open unnamed data stream of " - "extracted file `%s'", - dentry->full_path_utf8); - return WIMLIB_ERR_NTFS_3G; + u8 reparse_data_buf[8 + wim_resource_size(lte)]; + u8 *p = reparse_data_buf; + 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, 0); + if (ret != 0) + return ret; + + 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'", + dentry->full_path_utf8); + return WIMLIB_ERR_NTFS_3G; + } + args->progress.extract.completed_bytes += wim_resource_size(lte); + return 0; +} + +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, + * so that the DOS name is correctly associated with the corresponding long name + * in the Win32 namespace, and not any of the additional names in the POSIX + * namespace created from hard links. + */ +static int preapply_dentry_with_dos_name(struct dentry *dentry, + ntfs_inode **dir_ni_p, + struct apply_args *args) +{ + struct dentry *other; + struct dentry *dentry_with_dos_name; + + dentry_with_dos_name = NULL; + 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", + dentry_with_dos_name->full_path_utf8); + return WIMLIB_ERR_INVALID_DENTRY; + } + dentry_with_dos_name = other; } - ret = extract_resource_to_ntfs_attr(w, <e->resource_entry, na); + } + /* If there's a dentry with a DOS name, extract it first */ + if (dentry_with_dos_name && !dentry_with_dos_name->is_extracted) { + char *p; + const char *dir_name; + char orig; + int ret; + ntfs_volume *vol = (*dir_ni_p)->vol; + + DEBUG("pre-applying DOS name `%s'", + dentry_with_dos_name->full_path_utf8); + ret = do_apply_dentry_ntfs(dentry_with_dos_name, + *dir_ni_p, args); if (ret != 0) return ret; - ntfs_attr_close(na); + 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); + return WIMLIB_ERR_NTFS_3G; + } } - 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 __ntfs_apply_dentry(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) { - ntfs_inode *ni; - int ret; + 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; - print_dentry(dentry, w->lookup_table); - - if (dentry_is_directory(dentry)) + if (inode->attributes & FILE_ATTRIBUTE_DIRECTORY) { type = S_IFDIR; - else + } else { + /* 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, 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. */ + if (inode->extracted_file) { + ret = apply_hardlink_ntfs(dentry, inode, + dir_ni, &ni); + is_hardlink = true; + if (ret) + goto out_close_dir_ni; + 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) { + ret = WIMLIB_ERR_NOMEM; + goto out_close_dir_ni; + } + } + } + + /* + * Create a directory or file. + * + * Note: For symbolic links that are not directory junctions, pass + * S_IFREG here, since we manually set the reparse data later. + */ ni = ntfs_create(dir_ni, 0, (ntfschar*)dentry->file_name, dentry->file_name_len / 2, type); @@ -137,100 +431,178 @@ static int __ntfs_apply_dentry(struct dentry *dentry, ntfs_inode *dir_ni, ERROR_WITH_ERRNO("Could not create NTFS object for `%s'", dentry->full_path_utf8); ret = WIMLIB_ERR_NTFS_3G; - goto out; + goto out_close_dir_ni; } - if (!dentry_is_directory(dentry) && - !(dentry->attributes & FILE_ATTRIBUTE_REPARSE_POINT)) { - ret = write_ntfs_data_streams(ni, dentry, w); + /* Write the data streams, unless this is a directory or reparse point + * */ + if (!(inode->attributes & (FILE_ATTRIBUTE_REPARSE_POINT | + FILE_ATTRIBUTE_DIRECTORY))) { + ret = write_ntfs_data_streams(ni, dentry, args); if (ret != 0) - goto out; + goto out_close_dir_ni; } - DEBUG("Setting file attributes 0x%x on `%s'", - dentry->attributes, - dentry->full_path_utf8); - if (!_ntfs_set_file_attributes(ni, dentry->attributes)) { - ERROR("Failed to set NTFS file attributes on `%s'", - dentry->full_path_utf8); - ret = WIMLIB_ERR_NTFS_3G; - goto out; + 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, args); + if (ret != 0) + goto out_close_dir_ni; } - if (dentry->security_id != -1) { - const struct wim_security_data *sd = wim_security_data(w); - wimlib_assert(dentry->security_id < sd->num_entries); - DEBUG("Applying security descriptor %d to `%s'", - dentry->security_id, dentry->full_path_utf8); - if (!_ntfs_set_file_security(ni->vol, ni, ~0, - sd->descriptors[dentry->security_id])) - { - ERROR_WITH_ERRNO("Failed to set security data on `%s'", - dentry->full_path_utf8); - ret = WIMLIB_ERR_NTFS_3G; - goto out; +out_set_dos_name: + /* Set DOS (short) name if given */ + if (dentry->short_name_len != 0) { + + 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; + goto out_close_dir_ni; } - } - if (dentry->attributes & FILE_ATTR_REPARSE_POINT) { - struct lookup_table_entry *lte; - ntfs_inode *ni; - lte = dentry_first_lte(dentry, w->lookup_table); - if (!lte) { - ERROR("Could not find reparse data for `%s'", - dentry->full_path_utf8); - ret = WIMLIB_ERR_INVALID_DENTRY; - goto out; + 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; + } + 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; + } } - - ret = ntfs_set_ntfs_reparse_data(ni, lte->symlink_buf, - lte->resource_entry.original_size, - 0); + + DEBUG("Setting short (DOS) name of `%s' to %s", + dentry->full_path_utf8, short_name_utf8); + + ret = ntfs_set_ntfs_dos_name(ni, dir_ni, short_name_utf8, + short_name_utf8_len, 0); + FREE(short_name_utf8); if (ret != 0) { - ERROR_WITH_ERRNO("Failed to set NTFS reparse data on " - "`%s'", dentry->full_path_utf8); + ERROR_WITH_ERRNO("Could not set DOS (short) name for `%s'", + dentry->full_path_utf8); ret = WIMLIB_ERR_NTFS_3G; - goto out; } + /* inodes have been closed by ntfs_set_ntfs_dos_name(). */ + return ret; } - if (ntfs_inode_close_in_dir(ni, dir_ni) != 0) { - ERROR_WITH_ERRNO("Failed to close new inode"); +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"); + } + return ret; +} + +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"); + return WIMLIB_ERR_NTFS_3G; + } + 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"); ret = WIMLIB_ERR_NTFS_3G; - goto out; } -out: return ret; } -static int ntfs_apply_dentry(struct dentry *dentry, void *arg) +/* Applies a WIM dentry to the NTFS volume */ +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; ntfs_inode *dir_ni; - int ret; + char *p; + char orig; + const char *dir_name; - DEBUG("Applying `%s'", dentry->full_path_utf8); - - if (dentry_is_root(dentry)) + if (dentry->is_extracted) return 0; - if (extract_flags & WIMLIB_EXTRACT_FLAG_VERBOSE) { - wimlib_assert(dentry->full_path_utf8); - puts(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) && + args->progress_func) + { + args->progress.extract.cur_path = dentry->full_path_utf8; + args->progress_func(WIMLIB_PROGRESS_MSG_EXTRACT_DENTRY, + &args->progress); } - char *p = dentry->full_path_utf8 + dentry->full_path_utf8_len; + if (dentry_is_root(dentry)) + return apply_root_dentry_ntfs(dentry, vol, w); + + p = dentry->full_path_utf8 + dentry->full_path_utf8_len; do { p--; } while (*p != '/'); - char orig = *p; + orig = *p; *p = '\0'; - const char *dir_name = dentry->full_path_utf8; + dir_name = dentry->full_path_utf8; dir_ni = ntfs_pathname_to_inode(vol, NULL, dir_name); *p = orig; @@ -239,84 +611,43 @@ static int ntfs_apply_dentry(struct dentry *dentry, void *arg) dir_name); return WIMLIB_ERR_NTFS_3G; } - DEBUG("Found NTFS inode for `%s'", dir_name); - - ret = __ntfs_apply_dentry(dentry, dir_ni, w); - - if (ntfs_inode_close(dir_ni) != 0) { - if (ret == 0) - ret = WIMLIB_ERR_NTFS_3G; - ERROR_WITH_ERRNO("Failed to close directory inode"); - } - return ret; - + return do_apply_dentry_ntfs(dentry, dir_ni, arg); } -static int do_ntfs_apply(WIMStruct *w, const char *device, int extract_flags) +int apply_dentry_timestamps_ntfs(struct dentry *dentry, void *arg) { - ntfs_volume *vol; - int ret; - - 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), ntfs_apply_dentry, - &args); - if (ntfs_umount(vol, FALSE) != 0) { - ERROR_WITH_ERRNO("Failed to unmount NTFS volume"); - if (ret == 0) - ret = WIMLIB_ERR_NTFS_3G; - } - return ret; -} + struct apply_args *args = arg; + ntfs_volume *vol = args->vol; + u8 *p; + u8 buf[24]; + ntfs_inode *ni; + int ret = 0; -WIMLIBAPI int wimlib_apply_image_to_ntfs_volume(WIMStruct *w, int image, - const char *device, int flags) -{ - int ret; + DEBUG("Setting timestamps on `%s'", dentry->full_path_utf8); - if (!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 specifcy symlink or hardlink flags when applying "); - ERROR("directly to a NTFS volume"); - return WIMLIB_ERR_INVALID_PARAM; + ni = ntfs_pathname_to_inode(vol, NULL, dentry->full_path_utf8); + if (!ni) { + ERROR_WITH_ERRNO("Could not find NTFS inode for `%s'", + dentry->full_path_utf8); + return WIMLIB_ERR_NTFS_3G; } - ret = wimlib_select_image(w, 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; + p = buf; + 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'", + dentry->full_path_utf8); + ret = WIMLIB_ERR_NTFS_3G; } -#endif - return do_ntfs_apply(w, device, flags); -} -#else /* WITH_NTFS_3G */ -WIMLIBAPI int wimlib_apply_image_to_ntfs_volume(WIMStruct *w, int image, - const char *device, int flags) -{ - 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; + if (ntfs_inode_close(ni) != 0) { + if (ret == 0) + ret = WIMLIB_ERR_NTFS_3G; + ERROR_WITH_ERRNO("Failed to close NTFS inode for `%s'", + dentry->full_path_utf8); + } + return ret; } -#endif /* WITH_NTFS_3G */