NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ext-toolchain-wrapper: fix paths if executable was resolved by PATH

Browse Source 
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 <patrick.ziegler@fh-kl.de>
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Patrick Ziegler 2013-05-28 23:41:19 +00:00 committed by Peter Korsgaard
parent 14470b3259
commit 74ae7af927
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
toolchain/toolchain-external/ext-toolchain-wrapper.c
View File

@ -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");