From 55d6e3a7c7780bfd254f13e0a090adbf91aa3f68 Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Fri, 1 Mar 2024 21:17:00 +0000
Subject: slbt_exec_ctx_alloc(): refactor and simplify.
---
src/internal/slibtool_driver_impl.h | 2 +-
src/logic/slbt_exec_ctx.c | 109 ++++++++++++++++++------------------
2 files changed, 54 insertions(+), 57 deletions(-)
(limited to 'src')
diff --git a/src/internal/slibtool_driver_impl.h b/src/internal/slibtool_driver_impl.h
index b8aefb6..052daf2 100644
--- a/src/internal/slibtool_driver_impl.h
+++ b/src/internal/slibtool_driver_impl.h
@@ -183,7 +183,7 @@ struct slbt_exec_ctx_impl {
int fdwrapper;
char ** lout[2];
char ** mout[2];
- char * vbuffer[];
+ char ** vbuffer;
};
struct slbt_archive_ctx_impl {
diff --git a/src/logic/slbt_exec_ctx.c b/src/logic/slbt_exec_ctx.c
index fcde892..ec8ea3e 100644
--- a/src/logic/slbt_exec_ctx.c
+++ b/src/logic/slbt_exec_ctx.c
@@ -13,7 +13,8 @@
#include "slibtool_driver_impl.h"
#include "slibtool_errinfo_impl.h"
-#define SLBT_ARGV_SPARE_PTRS 16
+#define SLBT_ECTX_LIB_EXTRAS 20
+#define SLBT_ECTX_SPARE_PTRS 16
static size_t slbt_parse_comma_separated_flags(
const char * str,
@@ -68,71 +69,50 @@ static struct slbt_exec_ctx_impl * slbt_exec_ctx_alloc(
struct slbt_driver_ctx_impl * ctx;
struct slbt_exec_ctx_impl * ictx;
size_t size;
- size_t vsize;
+ size_t slen;
int argc;
char * args;
char * shadow;
char * csrc;
char ** parg;
- argc = 0;
- csrc = 0;
-
/* internal driver context for host-specific tool arguments */
ctx = slbt_get_driver_ictx(dctx);
- /* tool-specific argv: to simplify matters, be additive */
- argc += slbt_exec_ctx_tool_argc(ctx->host.ar_argv);
- argc += slbt_exec_ctx_tool_argc(ctx->host.as_argv);
- argc += slbt_exec_ctx_tool_argc(ctx->host.nm_argv);
- argc += slbt_exec_ctx_tool_argc(ctx->host.ranlib_argv);
- argc += slbt_exec_ctx_tool_argc(ctx->host.windres_argv);
- argc += slbt_exec_ctx_tool_argc(ctx->host.dlltool_argv);
- argc += slbt_exec_ctx_tool_argc(ctx->host.mdso_argv);
-
- /* clerical [worst-case] buffer size (guard, .libs, version) */
- size = strlen(".lo") + 1;
- size += 12 * (strlen(".libs/") + 1);
- size += 36 * (strlen(".0000") + 1);
+ /* initial buffer size (cargv, -Wc) */
+ argc = 0;
+ csrc = 0;
+ size = 0;
- /* buffer size (cargv, -Wc) */
- for (parg=dctx->cctx->cargv; *parg; parg++, argc++)
- if (!(strncmp("-Wc,",*parg,4)))
+ for (parg=dctx->cctx->cargv; *parg; parg++, argc++) {
+ if (!(strncmp("-Wc,",*parg,4))) {
size += slbt_parse_comma_separated_flags(
&(*parg)[4],&argc) + 1;
- else
+ } else {
size += strlen(*parg) + 1;
+ }
+ }
- /* buffer size (ldirname, lbasename, lobjname, aobjname, etc.) */
- if (dctx->cctx->output)
- size += 10*strlen(dctx->cctx->output);
- else if ((csrc = slbt_source_file(dctx->cctx->cargv)))
- size += 10*strlen(csrc);
+ /* argument transformation: additive, worst case scenario */
+ size += argc * (strlen(".lo") + 1);
+ size += argc * (strlen(".libs/") + 1);
+ size += argc * (strlen(".0000.0000.0000") + 1);
- /* pessimistic: long dso suffix, long x.y.z version */
- size += 10 * (16 + 16 + 16 + 16);
+ /* buffer size (csrc, ldirname, lbasename, lobjname, aobjname, etc.) */
+ if (dctx->cctx->libname) {
+ slen = strlen(dctx->cctx->libname);
+ size += (strlen(".slibtool.expsyms.extension") + slen + 1) * SLBT_ECTX_LIB_EXTRAS;
- /* pessimistic argc: .libs/libfoo.so --> -L.libs -lfoo */
- argc *= 2;
- argc += SLBT_ARGV_SPARE_PTRS;
-
- /* buffer size (.libs/%.o, pessimistic) */
- size += argc * strlen(".libs/-L-l");
-
- /* buffer size (linking) */
- if (dctx->cctx->mode == SLBT_MODE_LINK)
- size += strlen(dctx->cctx->settings.arprefix) + 1
- + strlen(dctx->cctx->settings.arsuffix) + 1
- + strlen(dctx->cctx->settings.mapsuffix) + 1
- + strlen(dctx->cctx->settings.dsoprefix) + 1
- + strlen(dctx->cctx->settings.dsoprefix) + 1
- + strlen(dctx->cctx->settings.dsoprefix) + 1
- + strlen(dctx->cctx->settings.exeprefix) + 1
- + strlen(dctx->cctx->settings.exeprefix) + 1
- + strlen(dctx->cctx->settings.impprefix) + 1
- + strlen(dctx->cctx->settings.impprefix) + 1;
+ } else if (dctx->cctx->output) {
+ slen = strlen(dctx->cctx->output);
+ size += (strlen(".slibtool.expsyms.extension") + slen + 1) * SLBT_ECTX_LIB_EXTRAS;
- /* alloc */
+ } else if ((csrc = slbt_source_file(dctx->cctx->cargv))) {
+ slen = strlen(csrc);
+ size += (strlen(".slibtool.expsyms.extension") + slen + 1) * SLBT_ECTX_LIB_EXTRAS;
+ }
+
+ /* string buffers: args, shadow */
if (!(args = malloc(size)))
return 0;
@@ -141,20 +121,36 @@ static struct slbt_exec_ctx_impl * slbt_exec_ctx_alloc(
return 0;
}
- /* ictx, argv, xargv */
- vsize = sizeof(*ictx);
- vsize += sizeof(char *) * (argc + 1);
- vsize += sizeof(char *) * (argc + 1);
+ /* tool-specific argv: to simplify matters, be additive */
+ argc += slbt_exec_ctx_tool_argc(ctx->host.ar_argv);
+ argc += slbt_exec_ctx_tool_argc(ctx->host.as_argv);
+ argc += slbt_exec_ctx_tool_argc(ctx->host.nm_argv);
+ argc += slbt_exec_ctx_tool_argc(ctx->host.ranlib_argv);
+ argc += slbt_exec_ctx_tool_argc(ctx->host.windres_argv);
+ argc += slbt_exec_ctx_tool_argc(ctx->host.dlltool_argv);
+ argc += slbt_exec_ctx_tool_argc(ctx->host.mdso_argv);
+
+ /* argv transformation: .libs/libfoo.so --> -L.libs -lfoo */
+ argc *= 2;
- /* altv: duplicate set, -Wl,--whole-archive, -Wl,--no-whole-archive */
- vsize += sizeof(char *) * (argc + 1) * 3;
+ /* argv ad-hoc extensions */
+ argc += SLBT_ECTX_SPARE_PTRS;
- if (!(ictx = calloc(1,vsize))) {
+ /* ctx alloc and vector alloc: argv, xargv, and altv, where we */
+ /* assume -Wl,--whole-archive arg -Wl,--no-whole-archive */
+ if (!(ictx = calloc(1,sizeof(*ictx)))) {
free(args);
free(shadow);
return 0;
}
+ if (!(ictx->vbuffer = calloc(5*(argc+1),sizeof(char *)))) {
+ free(args);
+ free(shadow);
+ free(ictx);
+ }
+
+ /* all ready */
ictx->dctx = dctx;
ictx->args = args;
ictx->argc = argc;
@@ -559,6 +555,7 @@ static int slbt_ectx_free_exec_ctx_impl(
free(ictx->args);
free(ictx->shadow);
+ free(ictx->vbuffer);
free (ictx);
return status;
--
cgit v1.2.3