X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Funix_apply.c;h=86be081ff006cf220ec2850512c8f032deddc00d;hp=fd5d972d404de454bef7dbb28d5a6b26d06977a0;hb=acfc301115f69877a634f3141908747a54f678a0;hpb=3d84c998673ba7acf82ec5c26769a41e28a2cc7b

diff --git a/src/unix_apply.c b/src/unix_apply.c
index fd5d972d..86be081f 100644
--- a/src/unix_apply.c
+++ b/src/unix_apply.c
@@ -54,7 +54,7 @@ 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);
 	if (fd < 0)
@@ -64,7 +64,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,37 +72,48 @@ 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;