X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fextract_image.c;h=0d83a182c6d042fa2ffec32cf898a0ec10b58bfa;hp=48a916ab5517652e4a2663c42446f983f7cd111e;hb=50ae56edcc3938f5183ddfc8910de2df5774eaf6;hpb=337df3674d64fff382890d1e8757dadf57d93b1f

diff --git a/src/extract_image.c b/src/extract_image.c
index 48a916ab..0d83a182 100644
--- a/src/extract_image.c
+++ b/src/extract_image.c
@@ -281,7 +281,7 @@ out_extract_unix_data:
 			ret = 0;
 		else
 			ret = fd_apply_unix_data(out_fd, &unix_data);
-		if (ret != 0)
+		if (ret)
 			goto out;
 	}
 	if (lte)
@@ -326,11 +326,11 @@ extract_symlink(struct wim_dentry *dentry,
 {
 	char target[4096 + args->target_realpath_len];
 	char *fixed_target;
+	const struct wim_inode *inode = dentry->d_inode;
 
-	ssize_t ret = inode_readlink(dentry->d_inode,
-				     target + args->target_realpath_len,
-				     sizeof(target) - args->target_realpath_len - 1,
-				     args->w, false);
+	ssize_t ret = wim_inode_readlink(inode,
+					 target + args->target_realpath_len,
+					 sizeof(target) - args->target_realpath_len - 1);
 	struct wim_lookup_table_entry *lte;
 
 	if (ret <= 0) {
@@ -342,10 +342,13 @@ extract_symlink(struct wim_dentry *dentry,
 	if (target[args->target_realpath_len] == '/' &&
 	    args->extract_flags & WIMLIB_EXTRACT_FLAG_RPFIX)
 	{
+		/* Fix absolute symbolic link target to point into the actual
+		 * extraction destination */
 		memcpy(target, args->target_realpath,
 		       args->target_realpath_len);
 		fixed_target = target;
 	} else {
+		/* Keep same link target */
 		fixed_target = target + args->target_realpath_len;
 	}
 	ret = symlink(fixed_target, output_path);
@@ -354,11 +357,9 @@ extract_symlink(struct wim_dentry *dentry,
 				 output_path, fixed_target);
 		return WIMLIB_ERR_LINK;
 	}
-	lte = inode_unnamed_lte_resolved(dentry->d_inode);
-	wimlib_assert(lte != NULL);
 	if (args->extract_flags & WIMLIB_EXTRACT_FLAG_UNIX_DATA) {
 		struct wimlib_unix_data unix_data;
-		ret = inode_get_unix_data(dentry->d_inode, &unix_data, NULL);
+		ret = inode_get_unix_data(inode, &unix_data, NULL);
 		if (ret > 0)
 			;
 		else if (ret < 0)
@@ -368,6 +369,8 @@ extract_symlink(struct wim_dentry *dentry,
 		if (ret)
 			return ret;
 	}
+	lte = inode_unnamed_lte_resolved(inode);
+	wimlib_assert(lte != NULL);
 	args->progress.extract.completed_bytes += wim_resource_size(lte);
 	return 0;
 }
@@ -421,10 +424,9 @@ dir_exists:
 }
 
 #ifndef __WIN32__
-static int unix_do_apply_dentry(const char *output_path,
-				size_t output_path_len,
-				struct wim_dentry *dentry,
-				struct apply_args *args)
+static int
+unix_do_apply_dentry(const char *output_path, size_t output_path_len,
+		     struct wim_dentry *dentry, struct apply_args *args)
 {
 	const struct wim_inode *inode = dentry->d_inode;
 
@@ -504,8 +506,8 @@ static int
 apply_dentry_normal(struct wim_dentry *dentry, void *arg)
 {
 	struct apply_args *args = arg;
-	tchar *output_path;
 	size_t len;
+	tchar *output_path;
 
 	len = tstrlen(args->target);
 	if (dentry_is_root(dentry)) {
@@ -546,7 +548,6 @@ apply_dentry_timestamps_normal(struct wim_dentry *dentry, void *arg)
 		output_path[len] = T('\0');
 	}
 
-
 #ifdef __WIN32__
 	return win32_do_apply_dentry_timestamps(output_path, len, dentry, args);
 #else
@@ -637,8 +638,21 @@ inode_find_streams_for_extraction(struct wim_inode *inode,
 		list_add_tail(&inode->i_lte_inode_list, &lte->inode_list);
 		inode_added = true;
 	}
-#ifdef WITH_NTFS_3G
-	if (extract_flags & WIMLIB_EXTRACT_FLAG_NTFS) {
+
+	/* Determine whether to include alternate data stream entries or not.
+	 *
+	 * UNIX:  Include them if extracting using NTFS-3g.
+	 *
+	 * Windows: Include them undconditionally, although if the filesystem is
+	 * not NTFS we won't actually be able to extract them. */
+#if defined(WITH_NTFS_3G)
+	if (extract_flags & WIMLIB_EXTRACT_FLAG_NTFS)
+#elif defined(__WIN32__)
+	if (1)
+#else
+	if (0)
+#endif
+	{
 		for (unsigned i = 0; i < inode->i_num_ads; i++) {
 			if (inode->i_ads_entries[i].stream_name_nbytes != 0) {
 				lte = inode->i_ads_entries[i].lte;
@@ -654,7 +668,6 @@ inode_find_streams_for_extraction(struct wim_inode *inode,
 			}
 		}
 	}
-#endif
 }
 
 static void
@@ -725,7 +738,7 @@ apply_stream_list(struct list_head *stream_list,
 				/* Extract the dentry if it was not already
 				 * extracted */
 				ret = maybe_apply_dentry(dentry, args);
-				if (ret != 0)
+				if (ret)
 					return ret;
 				if (progress_func &&
 				    args->progress.extract.completed_bytes >= next_progress)
@@ -796,7 +809,6 @@ extract_single_image(WIMStruct *w, int image,
 
 	struct apply_args args;
 	const struct apply_operations *ops;
-	tchar *target_realpath;
 
 	memset(&args, 0, sizeof(args));