X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Funix_apply.c;h=8d549f60005d6f5cc2e62cf080f97ed5dcbd2cf7;hb=b07618a49da651243b75130c2648a8413c932525;hp=3940d33a07cbf85d1ea209e2472ca8033610e99a;hpb=e3689bfa91c108ea0f5c86160bd594f98cd541a6;p=wimlib

diff --git a/src/unix_apply.c b/src/unix_apply.c
index 3940d33a..8d549f60 100644
--- a/src/unix_apply.c
+++ b/src/unix_apply.c
@@ -29,9 +29,9 @@
 
 #include "wimlib/apply.h"
 #include "wimlib/error.h"
-#include "wimlib/lookup_table.h"
 #include "wimlib/resource.h"
 #include "wimlib/timestamp.h"
+#include "wimlib/unix_data.h"
 
 #include <errno.h>
 #include <fcntl.h>
@@ -44,6 +44,10 @@
 #  include <utime.h>
 #endif
 
+#ifndef O_NOFOLLOW
+#  define O_NOFOLLOW 0
+#endif
+
 static int
 unix_start_extract(const char *target, struct apply_ctx *ctx)
 {
@@ -56,7 +60,7 @@ unix_start_extract(const char *target, struct apply_ctx *ctx)
 static int
 unix_create_file(const char *path, struct apply_ctx *ctx, u64 *cookie_ret)
 {
-	int fd = open(path, O_TRUNC | O_CREAT | O_WRONLY, 0644);
+	int fd = open(path, O_TRUNC | O_CREAT | O_WRONLY | O_NOFOLLOW, 0644);
 	if (fd < 0)
 		return WIMLIB_ERR_OPEN;
 	close(fd);
@@ -85,14 +89,12 @@ unix_makelink(const tchar *oldpath, const tchar *newpath,
 	      int (*makelink)(const tchar *oldpath, const tchar *newpath))
 {
 	if ((*makelink)(oldpath, newpath)) {
-		if (errno == EEXIST) {
-			if (unlink(newpath))
-				return WIMLIB_ERR_LINK;
-			if ((*makelink)(oldpath, newpath))
-				return WIMLIB_ERR_LINK;
-			return 0;
-		}
-		return WIMLIB_ERR_LINK;
+		if (errno != EEXIST)
+			return WIMLIB_ERR_LINK;
+		if (unlink(newpath))
+			return WIMLIB_ERR_LINK;
+		if ((*makelink)(oldpath, newpath))
+			return WIMLIB_ERR_LINK;
 	}
 	return 0;
 }
@@ -120,11 +122,11 @@ unix_extract_unnamed_stream(file_spec_t file,
 	int raw_fd;
 	int ret;
 
-	raw_fd = open(path, O_WRONLY | O_TRUNC);
+	raw_fd = open(path, O_WRONLY | O_TRUNC | O_NOFOLLOW);
 	if (raw_fd < 0)
 		return WIMLIB_ERR_OPEN;
 	filedes_init(&fd, raw_fd);
-	ret = extract_wim_resource_to_fd(lte, &fd, wim_resource_size(lte));
+	ret = extract_full_stream_to_fd(lte, &fd);
 	if (filedes_close(&fd) && !ret)
 		ret = WIMLIB_ERR_WRITE;
 	return ret;