summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2021-03-21 21:18:42 +0000
committermidipix <writeonce@midipix.org>2021-03-21 21:18:42 +0000
commit87b0f785dbe71aa6c19fbe7daeef9834798478d3 (patch)
treea65acd9e5af567411ad1a9427d89ee61ce6e0c2e
parentd75902bb4dae7b130d97eadd4a152d73ef83d1d4 (diff)
downloadslibtool-87b0f785dbe71aa6c19fbe7daeef9834798478d3.tar.bz2
slibtool-87b0f785dbe71aa6c19fbe7daeef9834798478d3.tar.xz
install mode: slbt_exec_install_entry(): added -shrext support.
-rw-r--r--src/logic/slbt_exec_install.c28
1 files changed, 26 insertions, 2 deletions
diff --git a/src/logic/slbt_exec_install.c b/src/logic/slbt_exec_install.c
index 4a24b87..3cf0e12 100644
--- a/src/logic/slbt_exec_install.c
+++ b/src/logic/slbt_exec_install.c
@@ -329,6 +329,8 @@ static int slbt_exec_install_entry(
char * base;
char * slash;
char * suffix;
+ char * dsosuffix;
+ char sobuf [64];
char target [PATH_MAX];
char srcfile [PATH_MAX];
char dstfile [PATH_MAX];
@@ -338,6 +340,7 @@ static int slbt_exec_install_entry(
bool fexe = false;
bool fpe;
bool frelease;
+ size_t slen;
struct stat st;
/* executable wrapper? */
@@ -367,6 +370,27 @@ static int slbt_exec_install_entry(
} else
sprintf(srcfile,".libs/%s",lasource);
+ /* -shrext, dsosuffix */
+ strcpy(sobuf,dctx->cctx->settings.dsosuffix);
+ dsosuffix = sobuf;
+
+ if ((size_t)snprintf(slnkname,sizeof(slnkname),"%s.shrext",
+ srcfile) >= sizeof(slnkname))
+ return SLBT_BUFFER_ERROR(dctx);
+
+ if (!stat(slnkname,&st)) {
+ if (slbt_readlink(slnkname,target,sizeof(target)) < 0)
+ return SLBT_SYSTEM_ERROR(dctx,slnkname);
+
+ if (strncmp(lasource,target,(slen = strlen(lasource))))
+ return SLBT_CUSTOM_ERROR(dctx,SLBT_ERR_INSTALL_FLOW);
+
+ if (strncmp(&target[slen],".shrext",7))
+ return SLBT_CUSTOM_ERROR(dctx,SLBT_ERR_INSTALL_FLOW);
+
+ strcpy(sobuf,&target[slen+7]);
+ }
+
/* executable? ordinary file? */
if (fexe || !dot || strcmp(dot,".la")) {
*src = fexe ? srcfile : (char *)entry->arg;
@@ -406,11 +430,11 @@ static int slbt_exec_install_entry(
dot = strrchr(slnkname,'.');
/* libfoo.a --> libfoo.so.release */
- sprintf(dot,"%s.release",dctx->cctx->settings.dsosuffix);
+ sprintf(dot,"%s.release",dsosuffix);
frelease = stat(slnkname,&st) ? false : true;
/* libfoo.a --> libfoo.so */
- strcpy(dot,dctx->cctx->settings.dsosuffix);
+ strcpy(dot,dsosuffix);
/* PE support: does .libs/libfoo.so.def exist? */
if ((size_t)snprintf(dstfile,sizeof(dstfile),"%s.def",