/*
* 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.
*/
/*
#include "config.h"
-
#include <ntfs-3g/endians.h>
#include <ntfs-3g/types.h>
#include "wimlib_internal.h"
+#include "buffer_io.h"
#include "dentry.h"
#include "lookup_table.h"
-#include "buffer_io.h"
-#include <ntfs-3g/layout.h>
-#include <ntfs-3g/acls.h>
+
#include <ntfs-3g/attrib.h>
#include <ntfs-3g/security.h> /* security.h before xattrs.h */
-#include <ntfs-3g/xattrs.h>
#include <ntfs-3g/reparse.h>
-#include <stdlib.h>
-#include <unistd.h>
+#include <ntfs-3g/xattrs.h>
+#include <string.h>
static int extract_wim_chunk_to_ntfs_attr(const u8 *buf, size_t len,
u64 offset, void *arg)
* 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)
{
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.
- * @inode: The WIM dentry that has an inode containing the streams.
+ * @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,
+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 inode *inode = dentry->d_inode;
+ const struct wim_inode *inode = dentry->d_inode;
+ struct wim_lookup_table_entry *lte;
DEBUG("Writing %u NTFS data stream%s for `%s'",
- inode->num_ads + 1,
- (inode->num_ads == 0 ? "" : "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;
-
- 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,
}
}
+
/* 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;
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;
+
+ /* 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->i_num_ads) /* Has the last stream been extracted? */
break;
- stream_name = (ntfschar*)inode->ads_entries[stream_idx].stream_name;
- stream_name_len = inode->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. */
-static ntfs_inode *dentry_open_parent_ni(const struct dentry *dentry,
+/* 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;
}
/*
- * Makes a NTFS hard link
+ * Makes a NTFS hard link.
+ *
+ * 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.
*
- * 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 new name is made in the POSIX namespace (this is the behavior of
+ * ntfs_link()). I am assuming this is an acceptable behavior; however, it's
+ * possible that the original name was actually in the Win32 namespace. Note
+ * that the WIM format does not provide enough information to distinguish Win32
+ * names from POSIX names in all cases.
*
* 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)
+static int apply_ntfs_hardlink(const struct wim_dentry *from_dentry,
+ const struct wim_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;
- 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);
+ from_dentry->full_path_utf8, inode->i_extracted_file);
- to_ni = ntfs_pathname_to_inode(vol, NULL, inode->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'",
- inode->extracted_file);
+ inode->i_extracted_file);
return WIMLIB_ERR_NTFS_3G;
}
- *to_ni_ret = to_ni;
-
dir_ni = dentry_open_parent_ni(from_dentry, vol);
- if (!dir_ni)
+ 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,
- inode->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,
ntfs_inode *dir_ni,
- const struct dentry *dentry,
+ const struct wim_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 wim_inode *inode;
+
+ inode = dentry->d_inode;
+
+ DEBUG("Setting NTFS file attributes on `%s' to %#"PRIx32,
+ 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,
dentry->full_path_utf8);
return WIMLIB_ERR_NTFS_3G;
}
- if (dentry->d_inode->security_id != -1) {
+ if (inode->i_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 = (const char *)sd->descriptors[dentry->d_inode->security_id];
+ 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->d_inode->security_id, dentry->full_path_utf8);
+ inode->i_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->i_security_id], 0);
if (ret != 0) {
ERROR_WITH_ERRNO("Failed to set security data on `%s'",
return 0;
}
-static int apply_reparse_data(ntfs_inode *ni, const struct dentry *dentry,
+/*
+ * 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;
lte = inode_unnamed_lte_resolved(dentry->d_inode);
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_u32(p, dentry->d_inode->i_reparse_tag); /* ReparseTag */
p = put_u16(p, wim_resource_size(lte)); /* ReparseDataLength */
p = put_u16(p, 0); /* Reserved */
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;
- }
- }
- /* 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;
-
- *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.
*
*
* @return: 0 on success; nonzero on failure.
*/
-static int do_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni,
+static int do_apply_dentry_ntfs(struct wim_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;
+ struct wim_inode *inode = dentry->d_inode;
+ dentry->is_extracted = 1;
- if (inode->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;
-
- 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;
+ 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);
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;
+ }
}
}
}
- /*
- * 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;
/* Write the data streams, unless this is a directory or reparse point
* */
- if (!(inode->attributes & (FILE_ATTRIBUTE_REPARSE_POINT |
+ if (!(inode->i_attributes & (FILE_ATTRIBUTE_REPARSE_POINT |
FILE_ATTRIBUTE_DIRECTORY))) {
ret = write_ntfs_data_streams(ni, dentry, &args->progress);
if (ret != 0)
}
- ret = apply_file_attributes_and_security_data(ni, dir_ni,
- dentry, args->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) {
+ if (inode->i_attributes & FILE_ATTR_REPARSE_POINT) {
ret = apply_reparse_data(ni, dentry, &args->progress);
if (ret != 0)
goto out_close_dir_ni;
}
-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,
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");
- goto out_close_ni;
- }
- if (ntfs_inode_close(ni) != 0) {
- if (ret == 0)
- ret = WIMLIB_ERR_NTFS_3G;
- ERROR_WITH_ERRNO("Failed to close hard link target inode");
- goto out;
- }
-
- dir_ni = dentry_open_parent_ni(dentry, vol);
- if (!dir_ni) {
- ret = WIMLIB_ERR_NTFS_3G;
- goto out;
- }
-
- 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);
- ntfs_inode_close(dir_ni);
- 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 = WIMLIB_ERR_NTFS_3G;
}
/* inodes have been closed by ntfs_set_ntfs_dos_name(). */
- return ret;
+ goto out;
}
-
out_close_dir_ni:
- if (ni && dir_ni) {
- if (ntfs_inode_close_in_dir(ni, dir_ni) != 0) {
- ni = NULL;
+ 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 for `%s'",
- dentry->full_path_utf8);
+ ERROR_WITH_ERRNO("Failed to close inode of directory "
+ "containing `%s'", dentry->full_path_utf8);
}
}
- if (ntfs_inode_close(dir_ni) != 0) {
- if (ret == 0)
- 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;
- ERROR_WITH_ERRNO("Failed to close inode for `%s'",
- dentry->full_path_utf8);
- }
out:
return ret;
}
-static int apply_root_dentry_ntfs(const struct dentry *dentry,
+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");
}
/* Applies a WIM dentry to the NTFS volume */
-int apply_dentry_ntfs(struct dentry *dentry, void *arg)
+int apply_dentry_ntfs(struct wim_dentry *dentry, void *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;
- char *p;
- char orig;
- const char *dir_name;
-
- if (dentry->is_extracted)
- return 0;
+ ntfs_volume *vol = args->vol;
+ WIMStruct *w = args->w;
+ struct wim_dentry *orig_dentry;
+ struct wim_dentry *other;
+ int ret;
- if (extract_flags & WIMLIB_EXTRACT_FLAG_NO_STREAMS)
- if (inode_unnamed_lte_resolved(dentry->d_inode))
- return 0;
+ /* Treat the root dentry specially. */
+ if (dentry_is_root(dentry))
+ return apply_root_dentry_ntfs(dentry, vol, w);
+ /* NTFS filename namespaces need careful consideration. A name for a
+ * NTFS file may be in either the POSIX, Win32, DOS, or Win32+DOS
+ * namespaces. The following list of assumptions and facts clarify the
+ * way that WIM dentries are mapped to NTFS files. The statements
+ * marked ASSUMPTION are statements I am assuming to be true due to the
+ * lack of documentation; they are verified in verify_dentry() and
+ * verify_inode() in verify.c.
+ *
+ * - ASSUMPTION: The root WIM dentry has neither a "long name" nor a
+ * "short name".
+ *
+ * - ASSUMPTION: Every WIM dentry other than the root directory provides
+ * a non-empty "long name" and a possibly empty "short name". The
+ * "short name" corresponds to the DOS name of the file, while the
+ * "long name" may be Win32 or POSIX.
+ *
+ * XXX It may actually be legal to have a short name but no long name
+ *
+ * - FACT: If a dentry has a "long name" but no "short name", then it is
+ * ambigious whether the name is POSIX or Win32+DOS, unless the name
+ * is a valid POSIX name but not a valid Win32+DOS name. wimlib
+ * currently will always create POSIX names for these files, as this
+ * is the behavior of the ntfs_create() and ntfs_link() functions.
+ *
+ * - FACT: Multiple WIM dentries may correspond to the same underlying
+ * inode, as provided at this point in the code by the d_inode member.
+ */
- 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);
+ /* Currently wimlib does not apply DOS names to hard linked files due to
+ * issues with ntfs-3g, so the following is commented out. */
+#if 0
+again:
+ /*
+ * libntfs-3g requires that for an NTFS inode with a DOS name, the
+ * corresponding long name be extracted first so that the DOS name is
+ * associated with the correct long name. Note that by the last
+ * ASSUMPTION above, a NTFS inode can have at most one DOS name (i.e. a
+ * WIM inode can have at most one non-empty short name).
+ *
+ * Therefore, search for an alias of this dentry that has a short name,
+ * and extract it first unless it was already extracted.
+ */
+ orig_dentry = NULL;
+ if (!dentry->d_inode->i_dos_name_extracted) {
+ inode_for_each_dentry(other, dentry->d_inode) {
+ if (other->short_name_len && other != dentry &&
+ !other->is_extracted)
+ {
+ orig_dentry = dentry;
+ dentry = other;
+ break;
+ }
+ }
+ dentry->d_inode->i_dos_name_extracted = 1;
}
+#endif
- if (dentry_is_root(dentry))
- return apply_root_dentry_ntfs(dentry, vol, w);
-
- dir_ni = dentry_open_parent_ni(dentry, vol);
+ ntfs_inode *dir_ni = dentry_open_parent_ni(dentry, vol);
if (dir_ni)
- return do_apply_dentry_ntfs(dentry, dir_ni, arg);
+ ret = do_apply_dentry_ntfs(dentry, dir_ni, arg);
else
- return WIMLIB_ERR_NTFS_3G;
+ ret = WIMLIB_ERR_NTFS_3G;
+
+#if 0
+ if (ret == 0 && orig_dentry) {
+ dentry = orig_dentry;
+ goto again;
+ }
+#endif
+ return ret;
}
-int apply_dentry_timestamps_ntfs(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 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 = 0;
+ int ret;
DEBUG("Setting timestamps on `%s'", dentry->full_path_utf8);
}
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);
+ 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'",