/*
* 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)
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,
- struct apply_args *args)
+ 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_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;
+
na = ntfs_attr_open(ni, AT_DATA, stream_name, stream_name_len);
if (!na) {
ERROR_WITH_ERRNO("Failed to open a data stream of "
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;
- args->progress.extract.completed_bytes += wim_resource_size(lte);
- 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 apply_hardlink_ntfs(const struct dentry *from_dentry,
+static int apply_ntfs_hardlink(const struct dentry *from_dentry,
const struct inode *inode,
- ntfs_inode *dir_ni,
- ntfs_inode **to_ni_ret)
+ 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);
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,
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 = (const char *)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'",
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,
- struct apply_args *args)
+ union wimlib_progress_info *progress_info)
{
struct lookup_table_entry *lte;
int ret = 0;
dentry->full_path_utf8);
return WIMLIB_ERR_NTFS_3G;
}
- args->progress.extract.completed_bytes += wim_resource_size(lte);
+ progress_info->extract.completed_bytes += wim_resource_size(lte);
return 0;
}
*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;
}
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 {
- /* 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, 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 = 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;
* */
if (!(inode->attributes & (FILE_ATTRIBUTE_REPARSE_POINT |
FILE_ATTRIBUTE_DIRECTORY))) {
- ret = write_ntfs_data_streams(ni, dentry, args);
+ 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, 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) {
- ret = apply_reparse_data(ni, dentry, args);
+ ret = apply_reparse_data(ni, dentry, &args->progress);
if (ret != 0)
goto out_close_dir_ni;
}
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;
}
}
}
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;
}
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");
int apply_dentry_ntfs(struct 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_volume *vol = args->vol;
+ WIMStruct *w = args->w;
ntfs_inode *dir_ni;
- char *p;
- char orig;
- const char *dir_name;
-
- if (dentry->is_extracted)
- return 0;
-
- 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);
- }
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 != '/');
-
- 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_apply_dentry_ntfs(dentry, dir_ni, 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 apply_args *args = arg;
u8 *p;
u8 buf[24];
ntfs_inode *ni;
- int ret = 0;
+ int ret;
DEBUG("Setting timestamps on `%s'", dentry->full_path_utf8);
git://wimlib.net / wimlib / blobdiff