code base: place the _host_flavor_ interfaces in their own translation unit.

2 files changed, 165 insertions, 157 deletions

diff --git a/src/host/slbt_host_flavor.c b/src/host/slbt_host_flavor.c
new file mode 100644
index 0000000..1df5413
--- /dev/null
+++ b/src/host/slbt_host_flavor.c
@@ -0,0 +1,165 @@
+/*******************************************************************/
+/*  slibtool: a skinny libtool implementation, written in C        */
+/*  Copyright (C) 2016--2024  SysDeer Technologies, LLC            */
+/*  Released under the Standard MIT License; see COPYING.SLIBTOOL. */
+/*******************************************************************/
+
+#include <slibtool/slibtool.h>
+#include "slibtool_driver_impl.h"
+
+/* elf rpath */
+static const char * ldrpath_elf[] = {
+	"/lib",
+	"/lib/64",
+	"/usr/lib",
+	"/usr/lib64",
+	"/usr/local/lib",
+	"/usr/local/lib64",
+	0};
+
+/* flavor settings */
+#define SLBT_FLAVOR_SETTINGS(flavor,          \
+		bfmt,pic,                     \
+		arp,ars,dsop,dsos,osds,osdf,  \
+		exep,exes,impp,imps,          \
+		ldenv)                        \
+	static const struct slbt_flavor_settings flavor = {  \
+		bfmt,arp,ars,dsop,dsos,osds,osdf,           \
+		exep,exes,impp,imps,                       \
+		ldenv,pic}
+
+SLBT_FLAVOR_SETTINGS(host_flavor_default,       \
+	"elf","-fPIC",                          \
+	"lib",".a","lib",".so",".so","",        \
+	"","","","",                            \
+	"LD_LIBRARY_PATH");
+
+SLBT_FLAVOR_SETTINGS(host_flavor_midipix,       \
+	"pe","-fPIC",                           \
+	"lib",".a","lib",".so",".so","",        \
+	"","","lib",".lib.a",                   \
+	"LD_LIBRARY_PATH");
+
+SLBT_FLAVOR_SETTINGS(host_flavor_mingw,         \
+	"pe",0,                                 \
+	"lib",".a","lib",".dll","",".dll",      \
+	"",".exe","lib",".dll.a",               \
+	"PATH");
+
+SLBT_FLAVOR_SETTINGS(host_flavor_cygwin,        \
+	"pe",0,                                 \
+	"lib",".a","lib",".dll","",".dll",      \
+	"",".exe","lib",".dll.a",               \
+	"PATH");
+
+SLBT_FLAVOR_SETTINGS(host_flavor_darwin,        \
+	"macho","-fPIC",                        \
+	"lib",".a","lib",".dylib","",".dylib",  \
+	"","","","",                            \
+	"DYLD_LIBRARY_PATH");
+
+
+slbt_hidden int slbt_init_ldrpath(
+	struct slbt_common_ctx *  cctx,
+	struct slbt_host_params * host)
+{
+	char *         buf;
+	const char **  ldrpath;
+
+	if (!cctx->rpath || !(cctx->drvflags & SLBT_DRIVER_IMAGE_ELF)) {
+		host->ldrpath = 0;
+		return 0;
+	}
+
+	/* common? */
+	for (ldrpath=ldrpath_elf; *ldrpath; ldrpath ++)
+		if (!(strcmp(cctx->rpath,*ldrpath))) {
+			host->ldrpath = 0;
+			return 0;
+		}
+
+	/* buf */
+	if (!(buf = malloc(12 + strlen(cctx->host.host))))
+		return -1;
+
+	/* /usr/{host}/lib */
+	sprintf(buf,"/usr/%s/lib",cctx->host.host);
+
+	if (!(strcmp(cctx->rpath,buf))) {
+		host->ldrpath = 0;
+		free(buf);
+		return 0;
+	}
+
+	/* /usr/{host}/lib64 */
+	sprintf(buf,"/usr/%s/lib64",cctx->host.host);
+
+	if (!(strcmp(cctx->rpath,buf))) {
+		host->ldrpath = 0;
+		free(buf);
+		return 0;
+	}
+
+	host->ldrpath = cctx->rpath;
+
+	free(buf);
+	return 0;
+}
+
+
+slbt_hidden void slbt_init_flavor_settings(
+	struct slbt_common_ctx *	cctx,
+	const struct slbt_host_params * ahost,
+	struct slbt_flavor_settings *	psettings)
+{
+	const struct slbt_host_params *     host;
+	const struct slbt_flavor_settings * settings;
+
+	host = ahost ? ahost : &cctx->host;
+
+	if (!strcmp(host->flavor,"midipix"))
+		settings = &host_flavor_midipix;
+	else if (!strcmp(host->flavor,"mingw"))
+		settings = &host_flavor_mingw;
+	else if (!strcmp(host->flavor,"cygwin"))
+		settings = &host_flavor_cygwin;
+	else if (!strcmp(host->flavor,"darwin"))
+		settings = &host_flavor_darwin;
+	else
+		settings = &host_flavor_default;
+
+	if (!ahost) {
+		if (!strcmp(settings->imagefmt,"elf"))
+			cctx->drvflags |= SLBT_DRIVER_IMAGE_ELF;
+		else if (!strcmp(settings->imagefmt,"pe"))
+			cctx->drvflags |= SLBT_DRIVER_IMAGE_PE;
+		else if (!strcmp(settings->imagefmt,"macho"))
+			cctx->drvflags |= SLBT_DRIVER_IMAGE_MACHO;
+	}
+
+	memcpy(psettings,settings,sizeof(*settings));
+
+	if (cctx->shrext)
+		psettings->dsosuffix = cctx->shrext;
+}
+
+
+int slbt_host_flavor_settings(
+	const char *                            flavor,
+	const struct slbt_flavor_settings **    settings)
+{
+	if (!strcmp(flavor,"midipix"))
+		*settings = &host_flavor_midipix;
+	else if (!strcmp(flavor,"mingw"))
+		*settings = &host_flavor_mingw;
+	else if (!strcmp(flavor,"cygwin"))
+		*settings = &host_flavor_cygwin;
+	else if (!strcmp(flavor,"darwin"))
+		*settings = &host_flavor_darwin;
+	else if (!strcmp(flavor,"default"))
+		*settings = &host_flavor_default;
+	else
+		*settings = 0;
+
+	return *settings ? 0 : -1;
+}
diff --git a/src/host/slbt_host_params.c b/src/host/slbt_host_params.c
index 0a8bc11..2fa7f11 100644
--- a/src/host/slbt_host_params.c
+++ b/src/host/slbt_host_params.c
@@ -29,58 +29,6 @@ static const char cfgnmachine[] = "native (cached in ccenv/host.mk)";
 static const char cfgxmachine[] = "foreign (derived from -dumpmachine)";
 static const char cfgnative[]   = "native";
 
-/* elf rpath */
-static const char*ldrpath_elf[] = {
-	"/lib",
-	"/lib/64",
-	"/usr/lib",
-	"/usr/lib64",
-	"/usr/local/lib",
-	"/usr/local/lib64",
-	0};
-
-/* flavor settings */
-#define SLBT_FLAVOR_SETTINGS(flavor,          \
-		bfmt,pic,                     \
-		arp,ars,dsop,dsos,osds,osdf,  \
-		exep,exes,impp,imps,          \
-		ldenv)                        \
-	static const struct slbt_flavor_settings flavor = {  \
-		bfmt,arp,ars,dsop,dsos,osds,osdf,           \
-		exep,exes,impp,imps,                       \
-		ldenv,pic}
-
-SLBT_FLAVOR_SETTINGS(host_flavor_default,       \
-	"elf","-fPIC",                          \
-	"lib",".a","lib",".so",".so","",        \
-	"","","","",                            \
-	"LD_LIBRARY_PATH");
-
-SLBT_FLAVOR_SETTINGS(host_flavor_midipix,       \
-	"pe","-fPIC",                           \
-	"lib",".a","lib",".so",".so","",        \
-	"","","lib",".lib.a",                   \
-	"LD_LIBRARY_PATH");
-
-SLBT_FLAVOR_SETTINGS(host_flavor_mingw,         \
-	"pe",0,                                 \
-	"lib",".a","lib",".dll","",".dll",      \
-	"",".exe","lib",".dll.a",               \
-	"PATH");
-
-SLBT_FLAVOR_SETTINGS(host_flavor_cygwin,        \
-	"pe",0,                                 \
-	"lib",".a","lib",".dll","",".dll",      \
-	"",".exe","lib",".dll.a",               \
-	"PATH");
-
-SLBT_FLAVOR_SETTINGS(host_flavor_darwin,        \
-	"macho","-fPIC",                        \
-	"lib",".a","lib",".dylib","",".dylib",  \
-	"","","","",                            \
-	"DYLD_LIBRARY_PATH");
-
-
 static void slbt_get_host_quad(
 	char *	hostbuf,
 	char ** hostquad)
@@ -539,91 +487,6 @@ slbt_hidden void slbt_free_host_params(struct slbt_host_strs * host)
 }
 
 
-slbt_hidden void slbt_init_flavor_settings(
-	struct slbt_common_ctx *	cctx,
-	const struct slbt_host_params * ahost,
-	struct slbt_flavor_settings *	psettings)
-{
-	const struct slbt_host_params *     host;
-	const struct slbt_flavor_settings * settings;
-
-	host = ahost ? ahost : &cctx->host;
-
-	if (!strcmp(host->flavor,"midipix"))
-		settings = &host_flavor_midipix;
-	else if (!strcmp(host->flavor,"mingw"))
-		settings = &host_flavor_mingw;
-	else if (!strcmp(host->flavor,"cygwin"))
-		settings = &host_flavor_cygwin;
-	else if (!strcmp(host->flavor,"darwin"))
-		settings = &host_flavor_darwin;
-	else
-		settings = &host_flavor_default;
-
-	if (!ahost) {
-		if (!strcmp(settings->imagefmt,"elf"))
-			cctx->drvflags |= SLBT_DRIVER_IMAGE_ELF;
-		else if (!strcmp(settings->imagefmt,"pe"))
-			cctx->drvflags |= SLBT_DRIVER_IMAGE_PE;
-		else if (!strcmp(settings->imagefmt,"macho"))
-			cctx->drvflags |= SLBT_DRIVER_IMAGE_MACHO;
-	}
-
-	memcpy(psettings,settings,sizeof(*settings));
-
-	if (cctx->shrext)
-		psettings->dsosuffix = cctx->shrext;
-}
-
-
-slbt_hidden int slbt_init_ldrpath(
-	struct slbt_common_ctx *  cctx,
-	struct slbt_host_params * host)
-{
-	char *         buf;
-	const char **  ldrpath;
-
-	if (!cctx->rpath || !(cctx->drvflags & SLBT_DRIVER_IMAGE_ELF)) {
-		host->ldrpath = 0;
-		return 0;
-	}
-
-	/* common? */
-	for (ldrpath=ldrpath_elf; *ldrpath; ldrpath ++)
-		if (!(strcmp(cctx->rpath,*ldrpath))) {
-			host->ldrpath = 0;
-			return 0;
-		}
-
-	/* buf */
-	if (!(buf = malloc(12 + strlen(cctx->host.host))))
-		return -1;
-
-	/* /usr/{host}/lib */
-	sprintf(buf,"/usr/%s/lib",cctx->host.host);
-
-	if (!(strcmp(cctx->rpath,buf))) {
-		host->ldrpath = 0;
-		free(buf);
-		return 0;
-	}
-
-	/* /usr/{host}/lib64 */
-	sprintf(buf,"/usr/%s/lib64",cctx->host.host);
-
-	if (!(strcmp(cctx->rpath,buf))) {
-		host->ldrpath = 0;
-		free(buf);
-		return 0;
-	}
-
-	host->ldrpath = cctx->rpath;
-
-	free(buf);
-	return 0;
-}
-
-
 void slbt_host_reset_althost(const struct slbt_driver_ctx * ctx)
 {
 	struct slbt_driver_ctx_alloc *	ictx;
@@ -685,23 +548,3 @@ int  slbt_host_set_althost(
 
 	return 0;
 }
-
-int slbt_host_flavor_settings(
-	const char *                            flavor,
-	const struct slbt_flavor_settings **    settings)
-{
-	if (!strcmp(flavor,"midipix"))
-		*settings = &host_flavor_midipix;
-	else if (!strcmp(flavor,"mingw"))
-		*settings = &host_flavor_mingw;
-	else if (!strcmp(flavor,"cygwin"))
-		*settings = &host_flavor_cygwin;
-	else if (!strcmp(flavor,"darwin"))
-		*settings = &host_flavor_darwin;
-	else if (!strcmp(flavor,"default"))
-		*settings = &host_flavor_default;
-	else
-		*settings = 0;
-
-	return *settings ? 0 : -1;
-}