Differences From Artifact [96a35a73db]:
- File src/OFApplication.m — part of check-in [c1dbf3b212] at 2014-07-18 10:08:25 on branch trunk — OFApplication: Only use argv if argc > 0 (user: js, size: 10182) [annotate] [blame] [check-ins using]
To Artifact [3fb6075d12]:
- File
src/OFApplication.m
— part of check-in
[ec66e49dca]
at
2014-10-04 21:59:51
on branch trunk
— Add +[OFSystemInfo native8BitEncoding]
This replaces +[OFString nativeOSEncoding]. (user: js, size: 10219) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
22 23 24 25 26 27 28 29 30 31 32 33 34 35 | #include <signal.h> #import "OFApplication.h" #import "OFString.h" #import "OFArray.h" #import "OFDictionary.h" #import "OFRunLoop.h" #import "OFRunLoop+Private.h" #import "OFThread.h" #import "OFThread+Private.h" #if defined(__MACH__) && !defined(OF_IOS) # include <crt_externs.h> | > | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | #include <signal.h> #import "OFApplication.h" #import "OFString.h" #import "OFArray.h" #import "OFDictionary.h" #import "OFSystemInfo.h" #import "OFRunLoop.h" #import "OFRunLoop+Private.h" #import "OFThread.h" #import "OFThread+Private.h" #if defined(__MACH__) && !defined(OF_IOS) # include <crt_externs.h> |
| ︙ | ︙ | |||
230 231 232 233 234 235 236 |
FreeEnvironmentStringsW(env0);
#elif !defined(OF_IOS)
if (env != NULL) {
for (; *env != NULL; env++) {
OFString *key, *value;
char *sep;
const of_string_encoding_t encoding =
| | | 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 |
FreeEnvironmentStringsW(env0);
#elif !defined(OF_IOS)
if (env != NULL) {
for (; *env != NULL; env++) {
OFString *key, *value;
char *sep;
const of_string_encoding_t encoding =
[OFSystemInfo native8BitEncoding];
pool = objc_autoreleasePoolPush();
if ((sep = strchr(*env, '=')) == NULL) {
fprintf(stderr, "Warning: Invalid "
"environment variable: %s\n", *env);
continue;
|
| ︙ | ︙ | |||
332 333 334 335 336 337 338 | OFMutableArray *arguments; int i; of_string_encoding_t encoding; _argc = argc; _argv = argv; | | | 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 |
OFMutableArray *arguments;
int i;
of_string_encoding_t encoding;
_argc = argc;
_argv = argv;
encoding = [OFSystemInfo native8BitEncoding];
# ifndef OF_NINTENDO_DS
if (*argc > 0) {
# else
if (__system_argv->argvMagic == ARGV_MAGIC &&
__system_argv->argc > 0) {
# endif
|
| ︙ | ︙ |