X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fntfs-apply.c;h=d3457fb894bfc6677a1c75dcaac33cf4a7d5d9a0;hp=063bc0ea55fdfed72393e43cb9f89c481bd4c973;hb=075e1470621233971f5785ce12e5106f3c0f4d42;hpb=de2db344b0d8a48b52c4cfaf0dbf35da9ffc6678

diff --git a/src/ntfs-apply.c b/src/ntfs-apply.c
index 063bc0ea..d3457fb8 100644
--- a/src/ntfs-apply.c
+++ b/src/ntfs-apply.c
@@ -49,8 +49,8 @@ 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_security(ntfs_inode *ni, u32 selection,
+				   const char *attr);
 extern int _ntfs_set_file_attributes(ntfs_inode *ni, s32 attrib);
 
 /* 
@@ -109,13 +109,16 @@ static int write_ntfs_data_streams(ntfs_inode *ni, const struct dentry *dentry,
 	ntfschar *stream_name = AT_UNNAMED;
 	u32 stream_name_len = 0;
 
-	DEBUG("Writing NTFS data streams for `%s'", dentry->full_path_utf8);
+	DEBUG("Writing %u NTFS data stream%s for `%s'",
+	      dentry->num_ads + 1,
+	      (dentry->num_ads == 0 ? "" : "s"),
+	      dentry->full_path_utf8);
 
 	while (1) {
 		struct lookup_table_entry *lte;
 		ntfs_attr *na;
 
-		lte = dentry_stream_lte(dentry, 0, w->lookup_table);
+		lte = dentry_stream_lte(dentry, stream_idx, 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 "
@@ -124,7 +127,7 @@ static int write_ntfs_data_streams(ntfs_inode *ni, const struct dentry *dentry,
 			ret = WIMLIB_ERR_NTFS_3G;
 			break;
 		}
-		if (lte && wim_resource_size(lte) != 0)
+		if (lte)
 			ret = extract_wim_resource_to_ntfs_attr(lte, na);
 		ntfs_attr_close(na);
 		if (ret != 0)
@@ -149,11 +152,15 @@ 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;
 	ntfs_inode *to_ni;
 
+	wimlib_assert(dentry_is_regular_file(from_dentry)
+			&& dentry_is_regular_file(to_dentry));
+
 	DEBUG("Extracting NTFS hard link `%s' => `%s'",
 	      from_dentry->full_path_utf8, to_dentry->extracted_file);
 
@@ -173,11 +180,7 @@ 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;
 }
 
@@ -201,7 +204,12 @@ apply_file_attributes_and_security_data(ntfs_inode *ni,
 		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,
+		u32 selection = OWNER_SECURITY_INFORMATION |
+				GROUP_SECURITY_INFORMATION |
+				DACL_SECURITY_INFORMATION  |
+				SACL_SECURITY_INFORMATION;
+				
+		if (!_ntfs_set_file_security(ni, selection,
 					     sd->descriptors[dentry->security_id]))
 		{
 			ERROR_WITH_ERRNO("Failed to set security data on `%s'",
@@ -254,6 +262,75 @@ static int apply_reparse_data(ntfs_inode *ni, const struct dentry *dentry,
 	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.
  *
@@ -264,33 +341,38 @@ static int apply_reparse_data(ntfs_inode *ni, const struct dentry *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 = 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;
+
+		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) {
+				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 */
 		FREE(dentry->extracted_file);
 		dentry->extracted_file = STRDUP(dentry->full_path_utf8);
 		if (!dentry->extracted_file) {
@@ -302,8 +384,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);
@@ -312,7 +394,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
@@ -321,26 +403,105 @@ 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;
 	}
 
 
 	ret = apply_file_attributes_and_security_data(ni, dentry, 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 (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;
+		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 (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;
+			}
+		}
+
+		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 (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");
 	}
-out:
 	return ret;
 }
 
@@ -377,8 +538,12 @@ static int wim_apply_dentry_ntfs(struct dentry *dentry, void *arg)
 	int ret;
 	char *p;
 	char orig;
+	ntfs_inode *close_after_dir;
 	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);
@@ -399,23 +564,56 @@ 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);
+}
 
-	ret = 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;
+	int extract_flags            = args->extract_flags;
+	WIMStruct *w                 = args->w;
+	char *p;
+	char buf[24];
+	ntfs_inode *ni;
+	int ret = 0;
 
-	if (ntfs_inode_close(dir_ni) != 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;
+	}
+
+	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, 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(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)
@@ -435,6 +633,14 @@ 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;
+	DEBUG("Setting NTFS timestamps");
+	ret = for_dentry_in_tree_depth(wim_root_dentry(w),
+				       wim_apply_dentry_timestamps,
+				       &args);
+out:
 	if (ntfs_umount(vol, FALSE) != 0) {
 		ERROR_WITH_ERRNO("Failed to unmount NTFS volume `%s'", device);
 		if (ret == 0)