From 74ae7af927da3e807e1e3b9a68a4bb1fed5243bb Mon Sep 17 00:00:00 2001 From: Patrick Ziegler Date: Tue, 28 May 2013 23:41:19 +0000 Subject: ext-toolchain-wrapper: fix paths if executable was resolved by PATH If ext-toolchain-wrapper or any symbolic link to it was resolved by PATH, the wrapper takes the working directory to calculate the relative paths. Now '/proc/self/exe' is used to resolve the absolute path to the toolchain directory if the wrapper was called neither with a relative nor an absolute path. [Peter: fix off-by-one, swap value == var checks around] Signed-off-by: Patrick Ziegler Tested-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- toolchain/toolchain-external/ext-toolchain-wrapper.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'toolchain') diff --git a/toolchain/toolchain-external/ext-toolchain-wrapper.c b/toolchain/toolchain-external/ext-toolchain-wrapper.c index 9a2fc70b0..9d79d68ad 100644 --- a/toolchain/toolchain-external/ext-toolchain-wrapper.c +++ b/toolchain/toolchain-external/ext-toolchain-wrapper.c @@ -61,7 +61,7 @@ int main(int argc, char **argv) char *relbasedir, *absbasedir; char *progpath = argv[0]; char *basename; - int ret; + int ret, i, count = 0; /* Calculate the relative paths */ basename = strrchr(progpath, '/'); @@ -77,7 +77,20 @@ int main(int argc, char **argv) absbasedir = realpath(relbasedir, NULL); } else { basename = progpath; - absbasedir = realpath("../..", NULL); + absbasedir = malloc(PATH_MAX + 1); + ret = readlink("/proc/self/exe", absbasedir, PATH_MAX); + if (ret < 0) { + perror(__FILE__ ": readlink"); + return 2; + } + absbasedir[ret] = '\0'; + for (i = ret; i > 0; i--) { + if (absbasedir[i] == '/') { + absbasedir[i] = '\0'; + if (++count == 3) + break; + } + } } if (absbasedir == NULL) { perror(__FILE__ ": realpath"); -- cgit v1.2.3