X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Funix_apply.c;h=8d549f60005d6f5cc2e62cf080f97ed5dcbd2cf7;hb=668c363a59c521f48eecbc4dd549c07a3e36179e;hp=fd5d972d404de454bef7dbb28d5a6b26d06977a0;hpb=3d84c998673ba7acf82ec5c26769a41e28a2cc7b;p=wimlib

diff --git a/src/unix_apply.c b/src/unix_apply.c
index fd5d972d..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)
 {
@@ -54,9 +58,9 @@ unix_start_extract(const char *target, struct apply_ctx *ctx)
 }
 
 static int
-unix_create_file(const char *path, struct apply_ctx *ctx)
+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);
@@ -64,7 +68,7 @@ unix_create_file(const char *path, struct apply_ctx *ctx)
 }
 
 static int
-unix_create_directory(const tchar *path, struct apply_ctx *ctx)
+unix_create_directory(const tchar *path, struct apply_ctx *ctx, u64 *cookie_ret)
 {
 	struct stat stbuf;
 
@@ -72,46 +76,57 @@ unix_create_directory(const tchar *path, struct apply_ctx *ctx)
 		if (errno != EEXIST)
 			return WIMLIB_ERR_MKDIR;
 		if (lstat(path, &stbuf))
-			return WIMLIB_ERR_STAT;
+			return WIMLIB_ERR_MKDIR;
 		errno = EEXIST;
 		if (!S_ISDIR(stbuf.st_mode))
-			return WIMLIB_ERR_NOTDIR;
+			return WIMLIB_ERR_MKDIR;
 	}
 	return 0;
 }
 
+static int
+unix_makelink(const tchar *oldpath, const tchar *newpath,
+	      int (*makelink)(const tchar *oldpath, const tchar *newpath))
+{
+	if ((*makelink)(oldpath, newpath)) {
+		if (errno != EEXIST)
+			return WIMLIB_ERR_LINK;
+		if (unlink(newpath))
+			return WIMLIB_ERR_LINK;
+		if ((*makelink)(oldpath, newpath))
+			return WIMLIB_ERR_LINK;
+	}
+	return 0;
+}
 static int
 unix_create_hardlink(const tchar *oldpath, const tchar *newpath,
 		     struct apply_ctx *ctx)
 {
-	if (link(oldpath, newpath))
-		return WIMLIB_ERR_LINK;
-	return 0;
+	return unix_makelink(oldpath, newpath, link);
 }
 
 static int
 unix_create_symlink(const tchar *oldpath, const tchar *newpath,
 		    struct apply_ctx *ctx)
 {
-	if (symlink(oldpath, newpath))
-		return WIMLIB_ERR_LINK;
-	return 0;
+	return unix_makelink(oldpath, newpath, symlink);
 }
 
 static int
-unix_extract_unnamed_stream(const tchar *path,
+unix_extract_unnamed_stream(file_spec_t file,
 			    struct wim_lookup_table_entry *lte,
 			    struct apply_ctx *ctx)
 {
+	const char *path = file.path;
 	struct filedes fd;
 	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;