From 62fcb8261873feb5ccac56c3e8dae17c1752fce6 Mon Sep 17 00:00:00 2001 From: KO Myung-Hun Date: Thu, 1 Dec 2016 19:52:44 +0900 Subject: [PATCH] relocatable: Fix that /@unixroot prefix is not working on OS/2 kLIBC OS/2 kLIBC has a feature to rewrite some path components. For example, '/@unixroot' is replaced with a value of $UNIXROOT if it is. So prepending a drive letter to the path starting with '/' makes the path starting with '/@unixroot' to 'x:/@unixroot' which is unexpected. This will breaks the behavior of some programs depending on /@unixroot prefix. * lib/relocatable.c (relocate): Do not touch pathname if it is started with '/@unixroot'. --- ChangeLog | 6 ++++++ lib/relocatable.c | 12 ++++++++++++ 2 files changed, 18 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6eaaf7f455..6b4d0d5c97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2016-12-01 KO Myung-Hun + + relocatable: Fix that /@unixroot prefix is not working on OS/2 kLIBC + * lib/relocatable.c (relocate): Do not touch pathname if it is started + with '/@unixroot'. + 2016-12-01 KO Myung-Hun sys_socket: typedef sa_family_t correctly on OS/2 kLIBC diff --git a/lib/relocatable.c b/lib/relocatable.c index 60cb54ac7e..401f3e0e45 100644 --- a/lib/relocatable.c +++ b/lib/relocatable.c @@ -539,6 +539,18 @@ relocate (const char *pathname) } #ifdef __EMX__ +# ifdef __KLIBC__ +# undef strncmp + + if (pathname && strncmp (pathname, "/@unixroot", 10) == 0 + && (pathname[10] == '\0' || pathname[10] == '/' || pathname[10] == '\\')) + { + /* kLIBC itself processes /@unixroot prefix */ + + return pathname; + } + else +# endif if (pathname && ISSLASH (pathname[0])) { const char *unixroot = getenv ("UNIXROOT"); -- 2.39.5