darlinghq/darling-openjdk
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-openjdk.git synced 2024-11-23 04:19:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[macos] Use @available to determine if we should get OS version from NSProcessInfo

Browse Source 
This is much cleaner than checking -respondsToSelector: and using objc_msgSend_stret()

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston Sequoia 2020-03-25 11:43:01 -07:00
parent 9eaae342d1
commit 06eca31d47
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/java.base/macosx/native/libjava/java_props_macosx.c
View File

@ -235,12 +235,8 @@ void setOSNameAndVersion(java_props_t *sprops) {
sprops->os_name = strdup("Mac OS X");
char* osVersionCStr = NULL;
// Mac OS 10.9 includes the [NSProcessInfo operatingSystemVersion] function,
// but it's not in the 10.9 SDK. So, call it via objc_msgSend_stret.
if ([[NSProcessInfo processInfo] respondsToSelector:@selector(operatingSystemVersion)]) {
OSVerStruct (*procInfoFn)(id rec, SEL sel) = (OSVerStruct(*)(id, SEL))objc_msgSend_stret;
OSVerStruct osVer = procInfoFn([NSProcessInfo processInfo],
@selector(operatingSystemVersion));
if (@available(macOS 10.10, *)) {
NSOperatingSystemVersion const osVer = NSProcessInfo.processInfo.operatingSystemVersion;
NSString *nsVerStr;
if (osVer.patchVersion == 0) { // Omit trailing ".0"
nsVerStr = [NSString stringWithFormat:@"%ld.%ld",
@ -251,9 +247,7 @@ void setOSNameAndVersion(java_props_t *sprops) {
}
// Copy out the char*
osVersionCStr = strdup([nsVerStr UTF8String]);
}
// Fallback if running on pre-10.9 Mac OS
if (osVersionCStr == NULL) {
} else {
NSDictionary *version = [NSDictionary dictionaryWithContentsOfFile :
@"/System/Library/CoreServices/SystemVersion.plist"];
if (version != NULL) {
@ -262,9 +256,10 @@ void setOSNameAndVersion(java_props_t *sprops) {
osVersionCStr = strdup([nsVerStr UTF8String]);
}
}
}
if (osVersionCStr == NULL) {
osVersionCStr = strdup("Unknown");
if (osVersionCStr == NULL) {
osVersionCStr = strdup("Unknown");
}
}
sprops->os_version = osVersionCStr;
}