X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fntfs-apply.c;h=108418b3444c8020b0f2d5f65d7fc2a3a1237e7f;hp=6243a914dfd3a2a6e05527e5afb66c85b5d828c9;hb=239e67483b8d6759fa97f25a65011cc3480368bc;hpb=7be97dea91241da8a7ca5f0ff32f320e692fe53f

diff --git a/src/ntfs-apply.c b/src/ntfs-apply.c
index 6243a914..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/.
  */
 
@@ -32,6 +31,7 @@
 #ifdef WITH_NTFS_3G
 #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>
@@ -48,46 +48,51 @@ struct ntfs_apply_args {
 	WIMStruct *w;
 };
 
-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);
+
+#ifndef WITH_NEW_NTFS_3G
+extern int ntfs_set_inode_security(ntfs_inode *ni, u32 selection,
+				   const char *attr);
+extern int ntfs_set_inode_attributes(ntfs_inode *ni, u32 attrib);
+#endif
 
 /* 
  * Extracts a WIM resource to a NTFS attribute.
  */
-static int extract_resource_to_ntfs_attr(WIMStruct *w, const struct resource_entry *entry, 
-					 ntfs_attr *na)
+static int
+extract_wim_resource_to_ntfs_attr(const struct lookup_table_entry *lte,
+			          ntfs_attr *na)
 {
-	return 0;
-#if 0
-	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 bytes_remaining = wim_resource_size(lte);
+	u8 buf[min(WIM_CHUNK_SIZE, bytes_remaining)];
 	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;
+	u8 hash[SHA1_HASH_SIZE];
 
-		ret = read_resource(w->fp, entry->size, entry->original_size,
-				    entry->offset, res_ctype, n, offset, buf);
-		if (ret != 0)
-			return ret;
+	SHA_CTX ctx;
+	sha1_init(&ctx);
 
-		if (ntfs_attr_pwrite(na, offset, n, buf) != n) {
-			ERROR("Failed to write to NTFS data stream");
+	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;
 		}
-		offset += n;
+		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)");
+		ERROR("The following WIM resource is invalid:");
+		print_lookup_table_entry(lte);
+		return WIMLIB_ERR_INVALID_RESOURCE_HASH;
 	}
 	return 0;
-#endif
 }
 
 /* Writes the data streams to a NTFS file
@@ -101,32 +106,60 @@ static int extract_resource_to_ntfs_attr(WIMStruct *w, const struct resource_ent
 static int write_ntfs_data_streams(ntfs_inode *ni, const struct dentry *dentry,
 				   WIMStruct *w)
 {
-	ntfs_attr *na;
-	struct lookup_table_entry *lte;
-	int ret;
-
-
-	DEBUG("Writing NTFS data streams for `%s'", dentry->full_path_utf8);
+	int ret = 0;
+	unsigned stream_idx = 0;
+	ntfschar *stream_name = AT_UNNAMED;
+	u32 stream_name_len = 0;
 
-	wimlib_assert(dentry->num_ads == 0);
+	DEBUG("Writing %u NTFS data stream%s for `%s'",
+	      dentry->num_ads + 1,
+	      (dentry->num_ads == 0 ? "" : "s"),
+	      dentry->full_path_utf8);
 
-	lte = dentry_stream_lte(dentry, 0, w->lookup_table);
-	if (lte && lte->resource_entry.original_size != 0) {
+	while (1) {
+		struct lookup_table_entry *lte;
+		ntfs_attr *na;
+
+		lte = dentry_stream_lte(dentry, stream_idx, w->lookup_table);
+
+		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;
 
-		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;
+			}
 		}
-		ret = extract_resource_to_ntfs_attr(w, &lte->resource_entry, na);
-		if (ret != 0)
-			return ret;
-		ntfs_attr_close(na);
+		/* 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;
+			ntfs_attr_close(na);
+		}
+		if (stream_idx == dentry->num_ads)
+			break;
+		stream_name = (ntfschar*)dentry->ads_entries[stream_idx].stream_name;
+		stream_name_len = dentry->ads_entries[stream_idx].stream_name_len / 2;
+		stream_idx++;
 	}
-
-	return 0;
+	return ret;
 }
 
 /*
@@ -140,21 +173,55 @@ static int write_ntfs_data_streams(ntfs_inode *ni, const struct dentry *dentry,
  */
 static int wim_apply_hardlink_ntfs(const struct dentry *from_dentry,
 				   const struct dentry *to_dentry,
-				   ntfs_inode *dir_ni)
+				   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)
+			&& 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);
@@ -164,14 +231,161 @@ static int wim_apply_hardlink_ntfs(const struct dentry *from_dentry,
 				 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);
-		ret = WIMLIB_ERR_NTFS_3G;
-	}
+	*to_ni_ret = to_ni;
 	return ret;
 }
 
+static int
+apply_file_attributes_and_security_data(ntfs_inode *ni,
+					const struct dentry *dentry,
+					const WIMStruct *w)
+{
+	DEBUG("Setting NTFS file attributes on `%s' to %#"PRIx32,
+	      dentry->full_path_utf8, 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;
+	}
+
+	if (dentry->security_id != -1) {
+		const struct wim_security_data *sd;
+		
+		sd = wim_const_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);
+		u32 selection = OWNER_SECURITY_INFORMATION |
+				GROUP_SECURITY_INFORMATION |
+				DACL_SECURITY_INFORMATION  |
+				SACL_SECURITY_INFORMATION;
+				
+		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);
+			return WIMLIB_ERR_NTFS_3G;
+		}
+	}
+	return 0;
+}
+
+static int apply_reparse_data(ntfs_inode *ni, const struct dentry *dentry,
+			      const WIMStruct *w)
+{
+	struct lookup_table_entry *lte;
+	int ret = 0;
+
+	wimlib_assert(dentry->attributes & FILE_ATTRIBUTE_REPARSE_POINT);
+
+	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'",
+		      dentry->full_path_utf8);
+		return WIMLIB_ERR_INVALID_DENTRY;
+	}
+
+	if (wim_resource_size(lte) >= 0xffff) {
+		ERROR("Reparse data of `%s' is too long (%lu bytes)",
+		      dentry->full_path_utf8, wim_resource_size(lte));
+		return WIMLIB_ERR_INVALID_DENTRY;
+	}
+
+	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 */
+
+	ret = read_full_wim_resource(lte, p);
+	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;
+	}
+	return 0;
+}
+
+static int do_wim_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni,
+				    WIMStruct *w);
+
+/* 
+ * 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,
+					 WIMStruct *w)
+{
+	int ret;
+	struct dentry *other;
+	struct dentry *dentry_with_dos_name;
+
+	if (dentry->link_group_list.next == &dentry->link_group_list)
+		return 0;
+
+	dentry_with_dos_name = NULL;
+	list_for_each_entry(other, &dentry->link_group_list,
+			    link_group_list)
+	{
+		if (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->extracted_file)
+	{
+		char *p;
+		const char *dir_name;
+		char orig;
+		ntfs_volume *vol = (*dir_ni_p)->vol;
+
+		DEBUG("pre-applying DOS name `%s'",
+		      dentry_with_dos_name->full_path_utf8);
+		ret = do_wim_apply_dentry_ntfs(dentry_with_dos_name,
+					       *dir_ni_p, w);
+		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);
+			return WIMLIB_ERR_NTFS_3G;
+		}
+	}
+	return 0;
+}
+
 /* 
  * Applies a WIM dentry to a NTFS filesystem.
  *
@@ -182,33 +396,43 @@ static int wim_apply_hardlink_ntfs(const struct dentry *from_dentry,
  * @return:  0 on success; nonzero on failure.
  */
 static int do_wim_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni,
-			            WIMStruct *w)
+				    WIMStruct *w)
 {
-	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;
 
-	if (dentry_is_directory(dentry)) {
+	if (dentry->attributes & FILE_ATTRIBUTE_DIRECTORY) {
 		type = S_IFDIR;
 	} 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;
+
 		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);
-				}
+		/* See if we can make a hard link */
+		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;
+				if (ret != 0)
+					goto out_close_dir_ni;
+				else
+					goto out_set_dos_name;
 			}
 		}
+		/* 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) {
@@ -220,8 +444,8 @@ static int do_wim_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni,
 	/* 
 	 * Create a 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, 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);
@@ -230,7 +454,7 @@ static int do_wim_apply_dentry_ntfs(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;
 	}
 
 	/* Write the data streams, unless this is a directory or reparse point
@@ -239,70 +463,130 @@ static int do_wim_apply_dentry_ntfs(struct dentry *dentry, ntfs_inode *dir_ni,
 	     !(dentry->attributes & FILE_ATTRIBUTE_REPARSE_POINT)) {
 		ret = write_ntfs_data_streams(ni, dentry, w);
 		if (ret != 0)
-			goto out;
+			goto out_close_dir_ni;
 	}
 
-	DEBUG("Setting NTFS file attributes on `%s' to %#"PRIx32,
-	      dentry->full_path_utf8, dentry->attributes);
 
-	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, dentry, w);
+	if (ret != 0)
+		goto out_close_dir_ni;
+
+	if (dentry->attributes & FILE_ATTR_REPARSE_POINT) {
+		ret = apply_reparse_data(ni, dentry, w);
+		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;
+			}
 		}
 
-		char symlink_buf[wim_resource_size(lte)];
+		DEBUG("Setting short (DOS) name of `%s' to %s",
+		      dentry->full_path_utf8, short_name_utf8);
 
-		ret = read_full_wim_resource(lte, symlink_buf);
-		if (ret != 0)
-			goto out;
-		
-		ret = ntfs_set_ntfs_reparse_data(ni, symlink_buf,
-						 wim_resource_size(lte), 0);
+		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 wim_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, 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;
 }
 
+/* Applies a WIM dentry to the NTFS volume */
 static int wim_apply_dentry_ntfs(struct dentry *dentry, void *arg)
 {
 	struct ntfs_apply_args *args = arg;
@@ -310,21 +594,23 @@ 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;
 	const char *dir_name;
 
+	if (dentry->extracted_file)
+		return 0;
+
 	wimlib_assert(dentry->full_path_utf8);
 
 	DEBUG("Applying dentry `%s' to NTFS", dentry->full_path_utf8);
 
-	if (dentry_is_root(dentry))
-		return 0;
-
 	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);
+
 	p = dentry->full_path_utf8 + dentry->full_path_utf8_len;
 	do {
 		p--;
@@ -335,23 +621,54 @@ static int wim_apply_dentry_ntfs(struct dentry *dentry, void *arg)
 	dir_name = dentry->full_path_utf8;
 
 	dir_ni = ntfs_pathname_to_inode(vol, NULL, dir_name);
+	if (dir_ni)
+		DEBUG("Found NTFS inode for `%s'", dir_name);
 	*p = orig;
 	if (!dir_ni) {
 		ERROR_WITH_ERRNO("Could not find NTFS inode for `%s'",
 				 dir_name);
 		return WIMLIB_ERR_NTFS_3G;
 	}
-	DEBUG("Found NTFS inode for `%s'", dir_name);
+	return do_wim_apply_dentry_ntfs(dentry, dir_ni, w);
+}
+
+static int wim_apply_dentry_timestamps(struct dentry *dentry, void *arg)
+{
+	struct ntfs_apply_args *args = arg;
+	ntfs_volume *vol             = args->vol;
+	u8 *p;
+	u8 buf[24];
+	ntfs_inode *ni;
+	int ret = 0;
+
+
+	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'",
+				 dentry->full_path_utf8);
+		return WIMLIB_ERR_NTFS_3G;
+	}
 
-	ret = do_wim_apply_dentry_ntfs(dentry, dir_ni, w);
+	p = buf;
+	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, (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;
+	}
 
-	if (ntfs_inode_close(dir_ni) != 0) {
+	if (ntfs_inode_close(ni) != 0) {
 		if (ret == 0)
 			ret = WIMLIB_ERR_NTFS_3G;
-		ERROR_WITH_ERRNO("Failed to close directory inode");
+		ERROR_WITH_ERRNO("Failed to close NTFS inode for `%s'",
+				 dentry->full_path_utf8);
 	}
 	return ret;
-
 }
 
 static int do_wim_apply_image_ntfs(WIMStruct *w, const char *device, int extract_flags)
@@ -359,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);
@@ -371,8 +689,25 @@ static int do_wim_apply_image_ntfs(WIMStruct *w, const char *device, int extract
 	};
 	ret = for_dentry_in_tree(wim_root_dentry(w), wim_apply_dentry_ntfs,
 				 &args);
+
+	if (ret != 0)
+		goto out;
+	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");
+		ERROR_WITH_ERRNO("Failed to unmount NTFS volume `%s'", device);
 		if (ret == 0)
 			ret = WIMLIB_ERR_NTFS_3G;
 	}
@@ -408,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);
 }