ObjFW  Check-in [09e7348b89]

Overview
Comment:OFSystemInfo: Use cwd for paths on some consoles
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 09e7348b8972444614eb86eec275a9db6e522ad6863022d493bb576eaade8bd2
User & Date: js on 2023-08-28 23:15:11
Other Links: manifest | tags
Context
2023-08-29
11:24
configure: Fix for autoconf 2.61 check-in: 73234a33ca user: js tags: trunk
2023-08-28
23:15
OFSystemInfo: Use cwd for paths on some consoles check-in: 09e7348b89 user: js tags: trunk
19:09
README.md: Add years to thanks section check-in: 54b95ec1d1 user: js tags: trunk
Changes

Modified src/OFSystemInfo.m from [50bc975723] to [0621210a4b].

55
56
57
58
59
60
61
62


63
64
65
66
67
68
69
55
56
57
58
59
60
61

62
63
64
65
66
67
68
69
70







-
+
+








#import "OFSystemInfo.h"
#import "OFApplication.h"
#import "OFArray.h"
#import "OFData.h"
#import "OFDictionary.h"
#ifdef OF_HAVE_FILES
 #import "OFFile.h"
# import "OFFile.h"
# import "OFFileManager.h"
#endif
#import "OFIRI.h"
#import "OFLocale.h"
#import "OFNumber.h"
#import "OFOnce.h"
#import "OFString.h"

446
447
448
449
450
451
452


453
454
455
456
457
458
459
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462







+
+







	    pathC, PATH_MAX) != B_OK)
		return nil;

	return [OFIRI fileIRIWithPath: [OFString stringWithUTF8String: pathC]
			  isDirectory: true];
# elif defined(OF_AMIGAOS)
	return [OFIRI fileIRIWithPath: @"PROGDIR:" isDirectory: true];
# elif defined(OF_WII) || defined(OF_NINTENDO_3DS)
	return [[OFFileManager defaultManager] currentDirectoryIRI];
# else
	OFDictionary *env = [OFApplication environment];
	OFString *var;
	OFIRI *IRI;
	void *pool;

	if ((var = [env objectForKey: @"XDG_DATA_HOME"]) != nil &&
536
537
538
539
540
541
542


543
544
545
546
547
548
549
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554







+
+







	    pathC, PATH_MAX) != B_OK)
		return nil;

	return [OFIRI fileIRIWithPath: [OFString stringWithUTF8String: pathC]
			  isDirectory: true];
# elif defined(OF_AMIGAOS)
	return [OFIRI fileIRIWithPath: @"PROGDIR:" isDirectory: true];
# elif defined(OF_WII) || defined(OF_NINTENDO_3DS)
	return [[OFFileManager defaultManager] currentDirectoryIRI];
# else
	OFDictionary *env = [OFApplication environment];
	OFString *var;

	if ((var = [env objectForKey: @"XDG_CONFIG_HOME"]) != nil &&
	    var.length > 0)
		return [OFIRI fileIRIWithPath: var isDirectory: true];
613
614
615
616
617
618
619


620
621
622
623
624
625
626
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633







+
+








	if (path == nil)
		return nil;

	return [OFIRI fileIRIWithPath: path isDirectory: true];
# elif defined(OF_MINT)
	return [OFIRI fileIRIWithPath: @"u:\\tmp" isDirectory: true];
# elif defined(OF_WII) || defined(OF_NINTENDO_3DS)
	return [[OFFileManager defaultManager] currentDirectoryIRI];
# elif defined(OF_NINTENDO_SWITCH)
	static OFOnceControl onceControl = OFOnceControlInitValue;
	OFOnce(&onceControl, mountTmpFS);

	return tmpFSIRI;
# else
	OFString *path;