/*
* 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. Restore as much information as possible,
+ * including security data, file attributes, DOS names, and alternate data
+ * streams.
*/
/*
* 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"
+#include <ntfs-3g/endians.h>
+#include <ntfs-3g/types.h>
-#ifdef WITH_NTFS_3G
+#include "wimlib_internal.h"
+#include "buffer_io.h"
#include "dentry.h"
#include "lookup_table.h"
-#include "io.h"
-#include <ntfs-3g/layout.h>
-#include <ntfs-3g/acls.h>
+
#include <ntfs-3g/attrib.h>
-#include <ntfs-3g/misc.h>
+#include <ntfs-3g/security.h> /* security.h before xattrs.h */
#include <ntfs-3g/reparse.h>
-#include <ntfs-3g/security.h>
-#include <ntfs-3g/volume.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-struct ntfs_apply_args {
- ntfs_volume *vol;
- int extract_flags;
- WIMStruct *w;
-};
+#include <ntfs-3g/xattrs.h>
+#include <string.h>
-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);
+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,
+extract_wim_resource_to_ntfs_attr(const struct wim_lookup_table_entry *lte,
ntfs_attr *na)
{
- u64 bytes_remaining = wim_resource_size(lte);
- char 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 file)");
- 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 to which the streams are to be extracted.
*
- * @ni: The NTFS inode for the file.
- * @dentry: The directory entry in the WIM file.
- * @w: The WIMStruct for the WIM containing the image we are applying.
+ * @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)
+static int write_ntfs_data_streams(ntfs_inode *ni, const struct wim_dentry *dentry,
+ 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 wim_inode *inode = dentry->d_inode;
+ struct wim_lookup_table_entry *lte;
- DEBUG("Writing NTFS data streams for `%s'", dentry->full_path_utf8);
+ DEBUG("Writing %u NTFS data stream%s for `%s'",
+ inode->i_num_ads + 1,
+ (inode->i_num_ads == 0 ? "" : "s"),
+ dentry->full_path_utf8);
+ lte = inode->i_lte;
while (1) {
- struct lookup_table_entry *lte;
- ntfs_attr *na;
-
- lte = dentry_stream_lte(dentry, 0, 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 && wim_resource_size(lte) != 0)
+
+ /* If there's no lookup table entry, it's an empty stream.
+ * 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 "
+ "extracted file `%s'",
+ dentry->full_path_utf8);
+ 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);
- ntfs_attr_close(na);
- if (ret != 0)
- break;
- if (stream_idx == dentry->num_ads)
+
+ /* Close the attribute */
+ ntfs_attr_close(na);
+ if (ret != 0)
+ break;
+
+ /* 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->i_num_ads) /* Has the last stream been extracted? */
break;
- stream_name = (ntfschar*)dentry->ads_entries[stream_idx].stream_name;
- stream_name_len = dentry->ads_entries[stream_idx].stream_name_len / 2;
+
+ /* Get the name and lookup table entry for the next stream. */
+ stream_name = (ntfschar*)inode->i_ads_entries[stream_idx].stream_name;
+ stream_name_len = inode->i_ads_entries[stream_idx].stream_name_len / 2;
+ lte = inode->i_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 wim_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 @to_dentry->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->i_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->i_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,
- ntfs_inode *dir_ni)
+static int apply_ntfs_hardlink(const struct wim_dentry *from_dentry,
+ const struct wim_inode *inode,
+ ntfs_inode **dir_ni_p)
{
int ret;
ntfs_inode *to_ni;
+ ntfs_inode *dir_ni;
+ ntfs_volume *vol;
+
+ 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;
+ }
DEBUG("Extracting NTFS hard link `%s' => `%s'",
- from_dentry->full_path_utf8, to_dentry->extracted_file);
+ from_dentry->full_path_utf8, inode->i_extracted_file);
- to_ni = ntfs_pathname_to_inode(dir_ni->vol, NULL,
- to_dentry->extracted_file);
+ to_ni = ntfs_pathname_to_inode(vol, NULL, inode->i_extracted_file);
if (!to_ni) {
ERROR_WITH_ERRNO("Could not find NTFS inode for `%s'",
- to_dentry->extracted_file);
+ inode->i_extracted_file);
+ return WIMLIB_ERR_NTFS_3G;
+ }
+
+ dir_ni = dentry_open_parent_ni(from_dentry, vol);
+ if (!dir_ni) {
+ ntfs_inode_close(to_ni);
return WIMLIB_ERR_NTFS_3G;
}
+
+ *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,
- to_dentry->extracted_file);
- ret = WIMLIB_ERR_NTFS_3G;
- }
- if (ntfs_inode_close(to_ni) != 0) {
- ERROR_WITH_ERRNO("Failed to close NTFS inode for `%s'",
- to_dentry->extracted_file);
+ inode->i_extracted_file);
ret = WIMLIB_ERR_NTFS_3G;
}
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,
- const struct dentry *dentry,
+ ntfs_inode *dir_ni,
+ const struct wim_dentry *dentry,
const WIMStruct *w)
{
+ int ret;
+ struct SECURITY_CONTEXT ctx;
+ u32 attributes_le32;
+ const struct wim_inode *inode;
+
+ inode = dentry->d_inode;
+
DEBUG("Setting NTFS file attributes on `%s' to %#"PRIx32,
- dentry->full_path_utf8, dentry->attributes);
- if (!_ntfs_set_file_attributes(ni, dentry->attributes)) {
+ dentry->full_path_utf8, inode->i_attributes);
+
+ attributes_le32 = cpu_to_le32(inode->i_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 (inode->i_security_id != -1) {
+ const char *desc;
const struct wim_security_data *sd;
-
+
sd = wim_const_security_data(w);
- wimlib_assert(dentry->security_id < sd->num_entries);
+ wimlib_assert(inode->i_security_id < sd->num_entries);
+ desc = (const char *)sd->descriptors[inode->i_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;
-
- if (!_ntfs_set_file_security(ni->vol, ni, selection,
- sd->descriptors[dentry->security_id]))
- {
+ inode->i_security_id, dentry->full_path_utf8);
+
+ ret = ntfs_xattr_system_setxattr(&ctx, XATTR_NTFS_ACL,
+ ni, dir_ni, desc,
+ sd->sizes[inode->i_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;
return 0;
}
-static int apply_reparse_data(ntfs_inode *ni, const struct dentry *dentry,
- const WIMStruct *w)
+/*
+ * 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 wim_dentry *dentry,
+ union wimlib_progress_info *progress_info)
{
- struct lookup_table_entry *lte;
+ struct wim_lookup_table_entry *lte;
int ret = 0;
- wimlib_assert(dentry->attributes & FILE_ATTRIBUTE_REPARSE_POINT);
+ lte = inode_unnamed_lte_resolved(dentry->d_inode);
- lte = dentry_first_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'",
}
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;
}
- char reparse_data_buf[8 + wim_resource_size(lte)];
- char *p = reparse_data_buf;
- p = put_u32(p, dentry->reparse_tag); /* ReparseTag */
+ u8 reparse_data_buf[8 + wim_resource_size(lte)];
+ u8 *p = reparse_data_buf;
+ p = put_u32(p, dentry->d_inode->i_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;
- 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'",
dentry->full_path_utf8);
return WIMLIB_ERR_NTFS_3G;
}
+ progress_info->extract.completed_bytes += wim_resource_size(lte);
+ return 0;
+}
+
+static int do_apply_dentry_ntfs(struct wim_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 wim_dentry *dentry,
+ ntfs_inode **dir_ni_p,
+ struct apply_args *args)
+{
+ struct wim_dentry *other;
+ struct wim_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;
+ }
+ }
+ /* If there's a dentry with a DOS name, extract it first */
+ if (dentry_with_dos_name && !dentry_with_dos_name->is_extracted) {
+ 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;
+
+ *dir_ni_p = dentry_open_parent_ni(dentry, vol);
+ if (!*dir_ni_p)
+ 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 do_wim_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni,
- WIMStruct *w)
+static int do_apply_dentry_ntfs(struct wim_dentry *dentry, ntfs_inode *dir_ni,
+ struct apply_args *args)
{
- ntfs_inode *ni;
int ret = 0;
mode_t type;
+ ntfs_inode *ni = NULL;
+ ntfs_volume *vol = dir_ni->vol;
+ struct wim_inode *inode = dentry->d_inode;
+ dentry->is_extracted = 1;
- if (dentry->attributes & FILE_ATTRIBUTE_DIRECTORY) {
+ if (inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY) {
type = S_IFDIR;
} else {
+ /* 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, args);
+ if (ret != 0)
+ return ret;
+ }
type = S_IFREG;
- const struct list_head *head = &dentry->link_group_list;
- if (head->next != head) {
- /* This dentry is one of a hard link set of at least 2
- * dentries. If one of the other dentries has already
- * been extracted, make a hard link to the file
- * corresponding to this already-extracted directory.
- * Otherwise, extract the file, and set the
- * dentry->extracted_file field so that other dentries
- * in the hard link group can link to it. */
- struct dentry *other;
- list_for_each_entry(other, head, link_group_list) {
- if (other->extracted_file) {
- return wim_apply_hardlink_ntfs(
- dentry, other, dir_ni);
+ if (inode->i_nlink > 1) {
+ /* Inode has multiple dentries referencing it. */
+
+ if (inode->i_extracted_file) {
+ /* 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;
+ 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->i_extracted_file);
+ inode->i_extracted_file = STRDUP(dentry->full_path_utf8);
+ if (!inode->i_extracted_file) {
+ ret = WIMLIB_ERR_NOMEM;
+ goto out_close_dir_ni;
}
}
}
- FREE(dentry->extracted_file);
- dentry->extracted_file = STRDUP(dentry->full_path_utf8);
- if (!dentry->extracted_file) {
- ERROR("Failed to allocate memory for filename");
- return WIMLIB_ERR_NOMEM;
- }
}
- /*
- * Create a directory or file.
+ /* Create a NTFS directory or file.
*
- * Note: if it's a reparse point (such as a symbolic link), we still
- * 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;
+ goto out_close_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)) {
- ret = write_ntfs_data_streams(ni, dentry, w);
+ if (!(inode->i_attributes & (FILE_ATTRIBUTE_REPARSE_POINT |
+ FILE_ATTRIBUTE_DIRECTORY))) {
+ ret = write_ntfs_data_streams(ni, dentry, &args->progress);
if (ret != 0)
- goto out;
+ 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,
+ args->w);
if (ret != 0)
- goto out;
+ goto out_close_dir_ni;
- if (dentry->attributes & FILE_ATTR_REPARSE_POINT) {
- ret = apply_reparse_data(ni, dentry, w);
+ if (inode->i_attributes & FILE_ATTR_REPARSE_POINT) {
+ ret = apply_reparse_data(ni, dentry, &args->progress);
if (ret != 0)
- goto out;
+ goto out_close_dir_ni;
}
- if (ntfs_inode_close_in_dir(ni, dir_ni) != 0) {
- ERROR_WITH_ERRNO("Failed to close new inode");
- 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;
+ 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 (!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'",
+ dentry->full_path_utf8);
+ FREE(short_name_utf8);
+ ret = WIMLIB_ERR_NTFS_3G;
+ goto out_close_dir_ni;
+ }
+ }
+
+ 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("Could not set DOS (short) name for `%s'",
+ dentry->full_path_utf8);
+ ret = WIMLIB_ERR_NTFS_3G;
+ }
+ /* inodes have been closed by ntfs_set_ntfs_dos_name(). */
+ return ret;
+ }
+
+out_close_dir_ni:
+ 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);
}
-out:
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 wim_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, 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");
}
/* Applies a WIM dentry to the NTFS volume */
-static int wim_apply_dentry_ntfs(struct dentry *dentry, void *arg)
+int apply_dentry_ntfs(struct wim_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;
- int ret;
- char *p;
- char orig;
- const char *dir_name;
-
- 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 != '/');
+ 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;
+}
- orig = *p;
- *p = '\0';
- dir_name = dentry->full_path_utf8;
+/* Transfers the 100-nanosecond precision timestamps from a WIM dentry to a NTFS
+ * inode */
+int apply_dentry_timestamps_ntfs(struct wim_dentry *dentry, void *arg)
+{
+ struct apply_args *args = arg;
+ ntfs_volume *vol = args->vol;
+ u8 *p;
+ u8 buf[24];
+ ntfs_inode *ni;
+ int ret;
- dir_ni = ntfs_pathname_to_inode(vol, NULL, dir_name);
- *p = orig;
- if (!dir_ni) {
+ DEBUG("Setting timestamps on `%s'", dentry->full_path_utf8);
+
+ ni = ntfs_pathname_to_inode(vol, NULL, dentry->full_path_utf8);
+ if (!ni) {
ERROR_WITH_ERRNO("Could not find NTFS inode for `%s'",
- dir_name);
+ dentry->full_path_utf8);
return WIMLIB_ERR_NTFS_3G;
}
- DEBUG("Found NTFS inode for `%s'", dir_name);
- ret = do_wim_apply_dentry_ntfs(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");
+ p = buf;
+ p = put_u64(p, dentry->d_inode->i_creation_time);
+ p = put_u64(p, dentry->d_inode->i_last_write_time);
+ p = put_u64(p, dentry->d_inode->i_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;
}
- return ret;
-
-}
-static int do_wim_apply_image_ntfs(WIMStruct *w, const char *device, int extract_flags)
-{
- 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), wim_apply_dentry_ntfs,
- &args);
- if (ntfs_umount(vol, FALSE) != 0) {
- ERROR_WITH_ERRNO("Failed to unmount NTFS volume `%s'", device);
+ 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;
}
-
-
-/*
- * 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)
-{
- int ret;
-
- 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 specify symlink or hardlink flags when applying ");
- ERROR("directly to a NTFS volume");
- return WIMLIB_ERR_INVALID_PARAM;
- }
- 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;
- }
-#endif
- return do_wim_apply_image_ntfs(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;
-}
-#endif /* WITH_NTFS_3G */