Fix path format for backslashes on windows

This commit is contained in:
rfm 2023-11-21 13:18:43 +00:00
parent 5917e32dbb
commit d98bc5cf2f
2 changed files with 17 additions and 2 deletions

View file

@ -1,3 +1,8 @@
2023-11-21 Richard Frith-Macdonald <rfm@gnu.org>
* Source/objc-load.m: Fix to get library path in standardised form to
match code for getting executable path.
2023-11-21 Richard Frith-Macdonald <rfm@gnu.org>
* Headers/GNUstepBase/GSVersionMacros.h: Added GS_UNIMPLEMENTED to

View file

@ -259,6 +259,8 @@ GSPrivateSymbolPath(Class theClass)
#warning Under Cygwin, we may want to use cygwin_conv_path() to get the unix path back?
#endif
s = [NSString stringWithCharacters: buf length: wcslen(buf)];
s = [s stringByResolvingSymlinksInPath];
s = [s stringByStandardizingPath];
}
return s;
}
@ -275,7 +277,11 @@ NSString *GSPrivateSymbolPath(Class theClass)
*/
if (0 != dladdr((void*)theClass, &info))
{
return [NSString stringWithUTF8String: info.dli_fname];
NSString *s;
s = [NSString stringWithUTF8String: info.dli_fname];
s = [s stringByResolvingSymlinksInPath];
s = [s stringByStandardizingPath];
}
#endif
@ -317,7 +323,11 @@ NSString *GSPrivateSymbolPath(Class theClass)
if (ret)
{
return [NSString stringWithUTF8String: ret];
NSString *s;
s = [NSString stringWithUTF8String: ret];
s = [s stringByResolvingSymlinksInPath];
s = [s stringByStandardizingPath];
}
}
return nil;