link mode: move the archive creation logic to its own translation unit.

4 files changed, 165 insertions, 117 deletions

diff --git a/project/common.mk b/project/common.mk
index 4901c39..f81f2d7 100644
--- a/project/common.mk
+++ b/project/common.mk
@@ -28,6 +28,7 @@ API_SRCS = \
 	src/logic/slbt_exec_install.c \
 	src/logic/slbt_exec_link.c \
 	src/logic/slbt_exec_uninstall.c \
+	src/logic/linkcmd/slbt_linkcmd_archive.c \
 	src/logic/linkcmd/slbt_linkcmd_argv.c \
 	src/logic/linkcmd/slbt_linkcmd_deps.c \
 	src/logic/linkcmd/slbt_linkcmd_host.c \
diff --git a/src/internal/slibtool_linkcmd_impl.h b/src/internal/slibtool_linkcmd_impl.h
index db6cd8f..96eb6fa 100644
--- a/src/internal/slibtool_linkcmd_impl.h
+++ b/src/internal/slibtool_linkcmd_impl.h
@@ -63,4 +63,10 @@ int slbt_exec_link_create_import_library(
 	char *				deffilename,
 	char *				soname);
 
+int slbt_exec_link_create_archive(
+	const struct slbt_driver_ctx *	dctx,
+	struct slbt_exec_ctx *		ectx,
+	const char *			arfilename,
+	bool				fpic);
+
 #endif
diff --git a/src/logic/linkcmd/slbt_linkcmd_archive.c b/src/logic/linkcmd/slbt_linkcmd_archive.c
new file mode 100644
index 0000000..be8252f
--- /dev/null
+++ b/src/logic/linkcmd/slbt_linkcmd_archive.c
@@ -0,0 +1,158 @@
+/*******************************************************************/
+/*  slibtool: a skinny libtool implementation, written in C        */
+/*  Copyright (C) 2016--2021  SysDeer Technologies, LLC            */
+/*  Released under the Standard MIT License; see COPYING.SLIBTOOL. */
+/*******************************************************************/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <sys/stat.h>
+
+#include <slibtool/slibtool.h>
+#include "slibtool_driver_impl.h"
+#include "slibtool_errinfo_impl.h"
+#include "slibtool_linkcmd_impl.h"
+#include "slibtool_mapfile_impl.h"
+#include "slibtool_metafile_impl.h"
+#include "slibtool_snprintf_impl.h"
+#include "slibtool_symlink_impl.h"
+#include "slibtool_spawn_impl.h"
+
+static int slbt_exec_link_create_noop_symlink(
+	const struct slbt_driver_ctx *	dctx,
+	struct slbt_exec_ctx *		ectx,
+	const char *			arfilename)
+{
+	struct stat st;
+	int         fdcwd;
+
+	/* fdcwd */
+	fdcwd = slbt_driver_fdcwd(dctx);
+
+	/* file exists? */
+	if (!fstatat(fdcwd,arfilename,&st,AT_SYMLINK_NOFOLLOW))
+		return 0;
+
+	/* needed? */
+	if (errno == ENOENT) {
+		if (slbt_create_symlink(
+				dctx,ectx,
+				"/dev/null",
+				arfilename,
+				SLBT_SYMLINK_LITERAL))
+			return SLBT_NESTED_ERROR(dctx);
+		return 0;
+	}
+
+	return SLBT_SYSTEM_ERROR(dctx,arfilename);
+}
+
+static int slbt_exec_link_remove_file(
+	const struct slbt_driver_ctx *	dctx,
+	struct slbt_exec_ctx *		ectx,
+	const char *			target)
+{
+	int fdcwd;
+
+	(void)ectx;
+
+	/* fdcwd */
+	fdcwd = slbt_driver_fdcwd(dctx);
+
+	/* remove target (if any) */
+	if (!unlinkat(fdcwd,target,0) || (errno == ENOENT))
+		return 0;
+
+	return SLBT_SYSTEM_ERROR(dctx,0);
+}
+
+int slbt_exec_link_create_archive(
+	const struct slbt_driver_ctx *	dctx,
+	struct slbt_exec_ctx *		ectx,
+	const char *			arfilename,
+	bool				fpic)
+{
+	int		fdcwd;
+	char ** 	aarg;
+	char ** 	parg;
+	char		program[PATH_MAX];
+	char		output [PATH_MAX];
+
+	/* -disable-static? */
+	if (dctx->cctx->drvflags & SLBT_DRIVER_DISABLE_STATIC)
+		if (dctx->cctx->rpath)
+			return slbt_exec_link_create_noop_symlink(
+				dctx,ectx,arfilename);
+
+	/* initial state */
+	slbt_reset_arguments(ectx);
+
+	/* placeholders */
+	slbt_reset_placeholders(ectx);
+
+	/* alternate program (ar, ranlib) */
+	ectx->program = program;
+
+	/* output */
+	if (slbt_snprintf(output,sizeof(output),
+			"%s",arfilename) < 0)
+		return SLBT_BUFFER_ERROR(dctx);
+
+	/* ar alternate argument vector */
+	if (slbt_snprintf(program,sizeof(program),
+			"%s",dctx->cctx->host.ar) < 0)
+		return SLBT_BUFFER_ERROR(dctx);
+
+
+	/* fdcwd */
+	fdcwd   = slbt_driver_fdcwd(dctx);
+
+	/* input argument adjustment */
+	aarg    = ectx->altv;
+	*aarg++ = program;
+	*aarg++ = "-crs";
+	*aarg++ = output;
+
+	for (parg=ectx->cargv; *parg; parg++)
+		if (slbt_adjust_object_argument(*parg,fpic,!fpic,fdcwd))
+			*aarg++ = *parg;
+
+	*aarg = 0;
+	ectx->argv = ectx->altv;
+
+	/* step output */
+	if (!(dctx->cctx->drvflags & SLBT_DRIVER_SILENT))
+		if (slbt_output_link(dctx,ectx))
+			return SLBT_NESTED_ERROR(dctx);
+
+	/* remove old archive as needed */
+	if (slbt_exec_link_remove_file(dctx,ectx,output))
+		return SLBT_NESTED_ERROR(dctx);
+
+	/* .deps */
+	if (slbt_exec_link_create_dep_file(
+			dctx,ectx,ectx->cargv,
+			arfilename,true))
+		return SLBT_NESTED_ERROR(dctx);
+
+	/* ar spawn */
+	if ((slbt_spawn(ectx,true) < 0) && (ectx->pid < 0)) {
+		return SLBT_SPAWN_ERROR(dctx);
+
+	} else if (ectx->exitcode) {
+		return SLBT_CUSTOM_ERROR(
+			dctx,
+			SLBT_ERR_AR_ERROR);
+	}
+
+	/* input objects associated with .la archives */
+	for (parg=ectx->cargv; *parg; parg++)
+		if (slbt_adjust_wrapper_argument(*parg,true))
+			if (slbt_archive_import(dctx,ectx,output,*parg))
+				return SLBT_NESTED_ERROR(dctx);
+
+	return 0;
+}
diff --git a/src/logic/slbt_exec_link.c b/src/logic/slbt_exec_link.c
index be2e143..4741a08 100644
--- a/src/logic/slbt_exec_link.c
+++ b/src/logic/slbt_exec_link.c
@@ -128,123 +128,6 @@ static int slbt_exec_link_remove_file(
 	return SLBT_SYSTEM_ERROR(dctx,0);
 }
 
-static int slbt_exec_link_create_noop_symlink(
-	const struct slbt_driver_ctx *	dctx,
-	struct slbt_exec_ctx *		ectx,
-	const char *			arfilename)
-{
-	struct stat st;
-	int         fdcwd;
-
-	/* fdcwd */
-	fdcwd = slbt_driver_fdcwd(dctx);
-
-	/* file exists? */
-	if (!fstatat(fdcwd,arfilename,&st,AT_SYMLINK_NOFOLLOW))
-		return 0;
-
-	/* needed? */
-	if (errno == ENOENT) {
-		if (slbt_create_symlink(
-				dctx,ectx,
-				"/dev/null",
-				arfilename,
-				SLBT_SYMLINK_LITERAL))
-			return SLBT_NESTED_ERROR(dctx);
-		return 0;
-	}
-
-	return SLBT_SYSTEM_ERROR(dctx,arfilename);
-}
-
-static int slbt_exec_link_create_archive(
-	const struct slbt_driver_ctx *	dctx,
-	struct slbt_exec_ctx *		ectx,
-	const char *			arfilename,
-	bool				fpic)
-{
-	int		fdcwd;
-	char ** 	aarg;
-	char ** 	parg;
-	char		program[PATH_MAX];
-	char		output [PATH_MAX];
-
-	/* -disable-static? */
-	if (dctx->cctx->drvflags & SLBT_DRIVER_DISABLE_STATIC)
-		if (dctx->cctx->rpath)
-			return slbt_exec_link_create_noop_symlink(
-				dctx,ectx,arfilename);
-
-	/* initial state */
-	slbt_reset_arguments(ectx);
-
-	/* placeholders */
-	slbt_reset_placeholders(ectx);
-
-	/* alternate program (ar, ranlib) */
-	ectx->program = program;
-
-	/* output */
-	if (slbt_snprintf(output,sizeof(output),
-			"%s",arfilename) < 0)
-		return SLBT_BUFFER_ERROR(dctx);
-
-	/* ar alternate argument vector */
-	if (slbt_snprintf(program,sizeof(program),
-			"%s",dctx->cctx->host.ar) < 0)
-		return SLBT_BUFFER_ERROR(dctx);
-
-
-	/* fdcwd */
-	fdcwd   = slbt_driver_fdcwd(dctx);
-
-	/* input argument adjustment */
-	aarg    = ectx->altv;
-	*aarg++ = program;
-	*aarg++ = "-crs";
-	*aarg++ = output;
-
-	for (parg=ectx->cargv; *parg; parg++)
-		if (slbt_adjust_object_argument(*parg,fpic,!fpic,fdcwd))
-			*aarg++ = *parg;
-
-	*aarg = 0;
-	ectx->argv = ectx->altv;
-
-	/* step output */
-	if (!(dctx->cctx->drvflags & SLBT_DRIVER_SILENT))
-		if (slbt_output_link(dctx,ectx))
-			return SLBT_NESTED_ERROR(dctx);
-
-	/* remove old archive as needed */
-	if (slbt_exec_link_remove_file(dctx,ectx,output))
-		return SLBT_NESTED_ERROR(dctx);
-
-	/* .deps */
-	if (slbt_exec_link_create_dep_file(
-			dctx,ectx,ectx->cargv,
-			arfilename,true))
-		return SLBT_NESTED_ERROR(dctx);
-
-	/* ar spawn */
-	if ((slbt_spawn(ectx,true) < 0) && (ectx->pid < 0)) {
-		return SLBT_SPAWN_ERROR(dctx);
-
-	} else if (ectx->exitcode) {
-		return SLBT_CUSTOM_ERROR(
-			dctx,
-			SLBT_ERR_AR_ERROR);
-	}
-
-	/* input objects associated with .la archives */
-	for (parg=ectx->cargv; *parg; parg++)
-		if (slbt_adjust_wrapper_argument(*parg,true))
-			if (slbt_archive_import(dctx,ectx,output,*parg))
-				return SLBT_NESTED_ERROR(dctx);
-
-	return 0;
-}
-
 static int slbt_exec_link_create_library(
 	const struct slbt_driver_ctx *	dctx,
 	struct slbt_exec_ctx *		ectx,