Differences From Artifact [6fd50f8c07]:
- File src/OFSystemInfo.m — part of check-in [27103855c2] at 2021-04-25 11:05:52 on branch new-naming-convention — A few last renames (user: js, size: 15971) [annotate] [blame] [check-ins using] [more...]
To Artifact [da4a435ab7]:
- File
src/OFSystemInfo.m
— part of check-in
[f372f73c49]
at
2021-08-07 22:51:17
on branch trunk
— OFSystemInfo: Use if (@available(...))
This avoids referencing the deprecated symbols even though the
replacements are available, which resulted in App Store rejection. (user: js, size: 16959) [annotate] [blame] [check-ins using] [more...]
| ︙ | ︙ | |||
350 351 352 353 354 355 356 |
+ (OFString *)userDataPath
{
# if defined(OF_MACOS) || defined(OF_IOS)
char pathC[PATH_MAX];
OFMutableString *path;
# ifdef HAVE_SYSDIR_START_SEARCH_PATH_ENUMERATION
| | < | 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 |
+ (OFString *)userDataPath
{
# if defined(OF_MACOS) || defined(OF_IOS)
char pathC[PATH_MAX];
OFMutableString *path;
# ifdef HAVE_SYSDIR_START_SEARCH_PATH_ENUMERATION
if (@available(macOS 10.12, iOS 10, *)) {
sysdir_search_path_enumeration_state state;
state = sysdir_start_search_path_enumeration(
SYSDIR_DIRECTORY_APPLICATION_SUPPORT,
SYSDIR_DOMAIN_MASK_USER);
if (sysdir_get_next_search_path_enumeration(state, pathC) == 0)
@throw [OFNotImplementedException
|
| ︙ | ︙ | |||
443 444 445 446 447 448 449 |
+ (OFString *)userConfigPath
{
# if defined(OF_MACOS) || defined(OF_IOS)
char pathC[PATH_MAX];
OFMutableString *path;
# ifdef HAVE_SYSDIR_START_SEARCH_PATH_ENUMERATION
| | < | 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 |
+ (OFString *)userConfigPath
{
# if defined(OF_MACOS) || defined(OF_IOS)
char pathC[PATH_MAX];
OFMutableString *path;
# ifdef HAVE_SYSDIR_START_SEARCH_PATH_ENUMERATION
if (@available(macOS 10.12, iOS 10, *)) {
sysdir_search_path_enumeration_state state;
state = sysdir_start_search_path_enumeration(
SYSDIR_DIRECTORY_LIBRARY, SYSDIR_DOMAIN_MASK_USER);
if (sysdir_get_next_search_path_enumeration(state, pathC) == 0)
@throw [OFNotImplementedException
exceptionWithSelector: _cmd
|
| ︙ | ︙ | |||
520 521 522 523 524 525 526 527 528 529 530 531 532 533 |
if ((var = [env objectForKey: @"HOME"]) == nil)
@throw [OFNotImplementedException exceptionWithSelector: _cmd
object: self];
return [var stringByAppendingPathComponent: @".config"];
# endif
}
#endif
+ (OFString *)CPUVendor
{
#if (defined(OF_X86_64) || defined(OF_X86)) && defined(__GNUC__)
struct X86Regs regs = x86CPUID(0, 0);
uint32_t buffer[3];
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 |
if ((var = [env objectForKey: @"HOME"]) == nil)
@throw [OFNotImplementedException exceptionWithSelector: _cmd
object: self];
return [var stringByAppendingPathComponent: @".config"];
# endif
}
+ (OFString *)temporaryDirectoryPath
{
# if defined(OF_MACOS) || defined(OF_IOS)
char buffer[PATH_MAX];
size_t length;
if ((length = confstr(_CS_DARWIN_USER_TEMP_DIR, buffer, PATH_MAX)) == 0)
return @"/tmp";
return [OFString stringWithCString: buffer
encoding: [OFLocale encoding]
length: length - 1];
# elif defined(OF_WINDOWS)
if ([self isWindowsNT]) {
wchar_t buffer[PATH_MAX];
if (!GetTempPathW(PATH_MAX, buffer))
return nil;
return [OFString stringWithUTF16String: buffer];
} else {
char buffer[PATH_MAX];
if (!GetTempPathA(PATH_MAX, buffer))
return nil;
return [OFString stringWithCString: buffer
encoding: [OFLocale encoding]];
}
# elif defined(OF_HAIKU)
char pathC[PATH_MAX];
if (find_directory(B_SYSTEM_TEMP_DIRECTORY, 0, false,
pathC, PATH_MAX) != B_OK)
@throw [OFNotImplementedException exceptionWithSelector: _cmd
object: self];
return [OFString stringWithUTF8String: pathC];
# elif defined(OF_AMIGAOS)
return @"T:";
# else
OFString *path =
[[OFApplication environment] objectForKey: @"XDG_RUNTIME_DIR"];
if (path != nil)
return path;
return @"/tmp";
# endif
}
#endif
+ (OFString *)CPUVendor
{
#if (defined(OF_X86_64) || defined(OF_X86)) && defined(__GNUC__)
struct X86Regs regs = x86CPUID(0, 0);
uint32_t buffer[3];
|
| ︙ | ︙ |