From a06474266cbd66d534cd2b3a7736a2961cd62ed3 Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Mon, 4 Mar 2024 05:49:35 +0000
Subject: link mode: refined .disabled placeholder logic (/dev/null <--> older
 linkers).

---
 src/internal/slibtool_symlink_impl.c | 10 +++++++---
 src/logic/slbt_exec_link.c           | 14 --------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/internal/slibtool_symlink_impl.c b/src/internal/slibtool_symlink_impl.c
index 34661f0..019d3d6 100644
--- a/src/internal/slibtool_symlink_impl.c
+++ b/src/internal/slibtool_symlink_impl.c
@@ -78,7 +78,14 @@ slbt_hidden int slbt_create_symlink(
 			lnkname) <0)
 		return SLBT_BUFFER_ERROR(dctx);
 
+	/* fdcwd */
+	fdcwd = slbt_driver_fdcwd(dctx);
+
 	/* placeholder? */
+	if (fdevnull)
+		if (unlinkat(fdcwd,lnkname,0) && (errno != ENOENT))
+			return SLBT_SYSTEM_ERROR(dctx,0);
+
 	if (suffix) {
 		sprintf(alnkarg,"%s%s",lnkname,suffix);
 		lnkname = alnkarg;
@@ -115,9 +122,6 @@ slbt_hidden int slbt_create_symlink(
 	/* restore execution context */
 	ectx->argv = oargv;
 
-	/* fdcwd */
-	fdcwd = slbt_driver_fdcwd(dctx);
-
 	/* create symlink */
 	if (symlinkat(atarget,fdcwd,tmplnk))
 		return SLBT_SYSTEM_ERROR(dctx,tmplnk);
diff --git a/src/logic/slbt_exec_link.c b/src/logic/slbt_exec_link.c
index 1e1e5b2..be9dc20 100644
--- a/src/logic/slbt_exec_link.c
+++ b/src/logic/slbt_exec_link.c
@@ -301,13 +301,6 @@ int slbt_exec_link(const struct slbt_driver_ctx * dctx)
 
 	/* static archive or convenience library only? */
 	if (fnodsolib && ectx->dsofilename) {
-		if (slbt_create_symlink(
-				dctx,ectx,
-				"/dev/null",
-				ectx->dsofilename,
-				SLBT_SYMLINK_LITERAL))
-			return SLBT_NESTED_ERROR(dctx);
-
 		if (slbt_create_symlink(
 				dctx,ectx,
 				"/dev/null",
@@ -318,13 +311,6 @@ int slbt_exec_link(const struct slbt_driver_ctx * dctx)
 
 	/* disable static? */
 	if (fnoarchive && ectx->arfilename) {
-		if (slbt_create_symlink(
-				dctx,ectx,
-				"/dev/null",
-				ectx->arfilename,
-				SLBT_SYMLINK_LITERAL))
-			return SLBT_NESTED_ERROR(dctx);
-
 		if (slbt_create_symlink(
 				dctx,ectx,
 				"/dev/null",
-- 
cgit v1.2.3