Differences From Artifact [1dbbe7eb69]:
- File src/OFSystemInfo.m — part of check-in [9f372df30f] at 2017-10-19 20:21:44 on branch trunk — OFSystemInfo: Prevent instantiation (user: js, size: 9186) [annotate] [blame] [check-ins using]
To Artifact [3fc178ff9d]:
- File
src/OFSystemInfo.m
— part of check-in
[4e926dc017]
at
2017-12-23 20:35:28
on branch trunk
— Implement fallback to NS*SearchPathEnumeration
This is used when sysdir_*_search_path_enumeration is unavailable.
Unfortunately, iOS 9 does not support sysdir_*_search_path_enumeration.
When compiled with a newer SDK, the symbol is available during linking,
but not at runtime, resulting in a crash. However, newer SDKs also
dropped NS*SearchPathEnumeration, so that it is not easy to provide a
fallback. This means that we need to declare all enums, types and
functions rather than just including them. (user: js, size: 10427) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
42 43 44 45 46 47 48 | #import "OFApplication.h" #import "OFNotImplementedException.h" #if defined(OF_MACOS) || defined(OF_IOS) # ifdef HAVE_SYSDIR_H # include <sysdir.h> | < < > > > > > > > > > > > > > > > > > > > > > > > > > > | 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 |
#import "OFApplication.h"
#import "OFNotImplementedException.h"
#if defined(OF_MACOS) || defined(OF_IOS)
# ifdef HAVE_SYSDIR_H
# include <sysdir.h>
# endif
#endif
#ifdef OF_WINDOWS
# include <windows.h>
#endif
#ifdef OF_HAIKU
# include <FindDirectory.h>
#endif
#ifdef OF_QNX
# include <sys/syspage.h>
#endif
#if defined(OF_MACOS) || defined(OF_IOS)
/*
* These have been dropped from newer iOS SDKs, however, their replacements are
* not available on iOS < 10. This means it's impossible to search for the
* paths when using a new SDK while targeting iOS 9 or earlier. To work around
* this, we define those manually, only to be used when the replacements are
* not available at runtime.
*/
typedef enum {
NSLibraryDirectory = 5,
NSApplicationSupportDirectory = 14
} NSSearchPathDirectory;
typedef enum {
NSUserDomainMask = 1
} NSSearchPathDomainMask;
typedef unsigned int NSSearchPathEnumerationState;
extern NSSearchPathEnumerationState NSStartSearchPathEnumeration(
NSSearchPathDirectory, NSSearchPathDomainMask);
extern NSSearchPathEnumerationState NSGetNextSearchPathEnumeration(
NSSearchPathEnumerationState, char *);
#endif
#if defined(OF_X86_64) || defined(OF_X86)
struct x86_regs {
uint32_t eax, ebx, ecx, edx;
};
#endif
|
| ︙ | ︙ | |||
149 150 151 152 153 154 155 |
+ (OFString *)userDataPath
{
#if defined(OF_MACOS) || defined(OF_IOS)
char pathC[PATH_MAX];
OFMutableString *path;
# ifdef HAVE_SYSDIR_START_SEARCH_PATH_ENUMERATION
| > > | | | > | | > | | > | | | | | > | > > | 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 |
+ (OFString *)userDataPath
{
#if defined(OF_MACOS) || defined(OF_IOS)
char pathC[PATH_MAX];
OFMutableString *path;
# ifdef HAVE_SYSDIR_START_SEARCH_PATH_ENUMERATION
/* (1) to disable dead code warning when it is not a weak symbol */
if ((1) && &sysdir_start_search_path_enumeration != NULL) {
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
exceptionWithSelector: _cmd
object: self];
} else {
# endif
NSSearchPathEnumerationState state;
state = NSStartSearchPathEnumeration(
NSApplicationSupportDirectory, NSUserDomainMask);
if (NSGetNextSearchPathEnumeration(state, pathC) == 0)
@throw [OFNotImplementedException
exceptionWithSelector: _cmd
object: self];
# ifdef HAVE_SYSDIR_START_SEARCH_PATH_ENUMERATION
}
# endif
path = [OFMutableString stringWithUTF8String: pathC];
if ([path hasPrefix: @"~"]) {
OFDictionary *env = [OFApplication environment];
OFString *home;
|
| ︙ | ︙ | |||
232 233 234 235 236 237 238 |
+ (OFString *)userConfigPath
{
#if defined(OF_MACOS) || defined(OF_IOS)
char pathC[PATH_MAX];
OFMutableString *path;
# ifdef HAVE_SYSDIR_START_SEARCH_PATH_ENUMERATION
| > > | | | | | > | | > | | | | | > | > > | 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 |
+ (OFString *)userConfigPath
{
#if defined(OF_MACOS) || defined(OF_IOS)
char pathC[PATH_MAX];
OFMutableString *path;
# ifdef HAVE_SYSDIR_START_SEARCH_PATH_ENUMERATION
/* (1) to disable dead code warning when it is not a weak symbol */
if ((1) && &sysdir_start_search_path_enumeration != NULL) {
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
object: self];
} else {
# endif
NSSearchPathEnumerationState state;
state = NSStartSearchPathEnumeration(NSLibraryDirectory,
NSUserDomainMask);
if (NSGetNextSearchPathEnumeration(state, pathC) == 0)
@throw [OFNotImplementedException
exceptionWithSelector: _cmd
object: self];
# ifdef HAVE_SYSDIR_START_SEARCH_PATH_ENUMERATION
}
# endif
path = [OFMutableString stringWithUTF8String: pathC];
if ([path hasPrefix: @"~"]) {
OFDictionary *env = [OFApplication environment];
OFString *home;
|
| ︙ | ︙ |