summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2021-04-02 19:58:21 +0100
committermidipix <writeonce@midipix.org>2021-04-02 19:05:29 +0000
commitacc4e7ffd5e38072ebc0abc0328cd169ab30efb0 (patch)
tree34c7f23fb8a8b7c233f469bd0ebd7473437cf96d
parentf27e858bae27a049f6f92dbe6b3ba4fcc28a9329 (diff)
downloadslibtool-acc4e7ffd5e38072ebc0abc0328cd169ab30efb0.tar.bz2
slibtool-acc4e7ffd5e38072ebc0abc0328cd169ab30efb0.tar.xz
link mode: enclose vnames in wrapper script in braces.
-rw-r--r--src/logic/slbt_exec_link.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/logic/slbt_exec_link.c b/src/logic/slbt_exec_link.c
index 11f1416..50fbf9c 100644
--- a/src/logic/slbt_exec_link.c
+++ b/src/logic/slbt_exec_link.c
@@ -478,7 +478,7 @@ static int slbt_exec_link_adjust_argument_vector(
*slash = 0;
if (slbt_dprintf(fdwrap,
- "DL_PATH=\"$DL_PATH$COLON%s%s%s\"\n"
+ "DL_PATH=\"${DL_PATH}${COLON}%s%s%s\"\n"
"COLON=':'\n\n",
((arg[0] == '/') ? "" : cwd),((arg[0] == '/') ? "" : "/"),arg) < 0)
return slbt_exec_link_exit(
@@ -559,7 +559,7 @@ static int slbt_exec_link_adjust_argument_vector(
if ((fdwrap = slbt_exec_get_fdwrapper(ectx)) >= 0) {
if (slbt_dprintf(fdwrap,
- "DL_PATH=\"$DL_PATH$COLON%s/%s\"\n"
+ "DL_PATH=\"${DL_PATH}${COLON}%s/%s\"\n"
"COLON=':'\n\n",
lib,depdir) < 0)
return slbt_exec_link_exit(
@@ -569,7 +569,7 @@ static int slbt_exec_link_adjust_argument_vector(
} else if ((mark[0] == '-') && (mark[1] == 'L')) {
if ((fdwrap = slbt_exec_get_fdwrapper(ectx)) >= 0) {
if (slbt_dprintf(fdwrap,
- "DL_PATH=\"$DL_PATH$COLON%s\"\n"
+ "DL_PATH=\"${DL_PATH}${COLON}%s\"\n"
"COLON=':'\n\n",
&mark[2]) < 0)
return slbt_exec_link_exit(
@@ -1600,7 +1600,7 @@ static int slbt_exec_link_create_executable(
fabspath = (exefilename[0] == '/');
if (slbt_dprintf(fdwrap,
- "DL_PATH=\"$DL_PATH$LCOLON$%s\"\n\n"
+ "DL_PATH=\"${DL_PATH}${LCOLON}${%s}\"\n\n"
"export %s=$DL_PATH\n\n"
"if [ `basename \"$0\"` = \"%s\" ]; then\n"
"\tprogram=\"$1\"; shift\n"