diff options
Diffstat (limited to 'lib/relocatable.c')
| -rw-r--r-- | lib/relocatable.c | 31 |
1 files changed, 26 insertions, 5 deletions
diff --git a/lib/relocatable.c b/lib/relocatable.c index 66532b40..810f19bf 100644 --- a/lib/relocatable.c +++ b/lib/relocatable.c @@ -1,12 +1,21 @@ /* Provide relocatable packages. - Copyright (C) 2003-2006, 2008-2015 Free Software Foundation, Inc. + Copyright (C) 2003-2006, 2008-2016 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2003. - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. + This program is free software: you can redistribute it and/or + modify it under the terms of either: + * the GNU Lesser General Public License as published by the Free + Software Foundation; either version 3 of the License, or (at your + option) any later version. + + or + + * the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at your + option) any later version. + + or both in parallel, as here. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -539,6 +548,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"); |