diff options
author | midipix <writeonce@midipix.org> | 2021-05-11 20:59:04 +0000 |
---|---|---|
committer | midipix <writeonce@midipix.org> | 2021-05-11 22:53:19 +0000 |
commit | 70949a39b9587465f5ab1d7930d1d100bc4485a0 (patch) | |
tree | 653df3dc598b43cabfbb464ac34f40497d6f541a /src/logic/slbt_exec_execute.c | |
parent | a7dc81851ba2af566ce6d99579375f9b073587af (diff) | |
download | slibtool-70949a39b9587465f5ab1d7930d1d100bc4485a0.tar.bz2 slibtool-70949a39b9587465f5ab1d7930d1d100bc4485a0.tar.xz |
link mode: slbt_exec_link_create_executable(): place .exe.wrapper under .libs/.
Diffstat (limited to 'src/logic/slbt_exec_execute.c')
-rw-r--r-- | src/logic/slbt_exec_execute.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/logic/slbt_exec_execute.c b/src/logic/slbt_exec_execute.c index b397306..9966e4d 100644 --- a/src/logic/slbt_exec_execute.c +++ b/src/logic/slbt_exec_execute.c @@ -49,16 +49,6 @@ int slbt_exec_execute( script = ectx->cargv[1]; if (script) { - /* wrapper */ - if ((size_t)snprintf(wrapper,sizeof(wrapper), - "%s%s.exe.wrapper", - (script[0] == '/') ? "" : "./", - script) - >= sizeof(wrapper)) { - slbt_free_exec_ctx(actx); - return SLBT_BUFFER_ERROR(dctx); - } - /* exeref */ if ((base = strrchr(script,'/'))) base++; @@ -69,6 +59,15 @@ int slbt_exec_execute( mark = exeref + (base - script); sprintf(mark,".libs/%s",base); + /* wrapper */ + if ((size_t)snprintf(wrapper,sizeof(wrapper), + "%s.exe.wrapper", + exeref) + >= sizeof(wrapper)) { + slbt_free_exec_ctx(actx); + return SLBT_BUFFER_ERROR(dctx); + } + /* fdcwd */ fdcwd = slbt_driver_fdcwd(dctx); |