From: Eric Biggers <ebiggers3@gmail.com>
Date: Thu, 15 Aug 2013 20:07:57 +0000 (-0500)
Subject: unix_apply.c:  Allow creating symlinks and hardlinks over existing files
X-Git-Tag: v1.5.0~71
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=38224a9fd97ee047951bb8ab99a089d5c67aebe5

unix_apply.c:  Allow creating symlinks and hardlinks over existing files
---

diff --git a/src/unix_apply.c b/src/unix_apply.c
index fd5d972d..bd576ef0 100644
--- a/src/unix_apply.c
+++ b/src/unix_apply.c
@@ -81,21 +81,33 @@ unix_create_directory(const tchar *path, struct apply_ctx *ctx)
 }
 
 static int
-unix_create_hardlink(const tchar *oldpath, const tchar *newpath,
-		     struct apply_ctx *ctx)
+unix_makelink(const tchar *oldpath, const tchar *newpath,
+	      int (*makelink)(const tchar *oldpath, const tchar *newpath))
 {
-	if (link(oldpath, 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;
+	}
 	return 0;
 }
+static int
+unix_create_hardlink(const tchar *oldpath, const tchar *newpath,
+		     struct apply_ctx *ctx)
+{
+	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