ObjFW: Diff

Differences From Artifact [db7a703dd2]:

File src/OFFileURLHandler.m — part of check-in [9135c5fcb8] at 2021-04-04 18:46:33 on branch trunk — Change -[contentsOfURLAtPath:] to return URLs
Returning strings is confusing for many as Foundation returns URLs here,
and URLs are often easier to work with during directory enumeration
anyway (no need to constantly append the current item to the base path). (user: js, size: 37049) [annotate] [blame] [check-ins using] [more...]

To Artifact [48c2c95cb9]:

File src/OFFileURLHandler.m — part of check-in [255f21fb3d] at 2021-04-17 02:10:02 on branch new-naming-convention — of_string_encoding_t -> OFStringEncoding (user: js, size: 36972) [annotate] [blame] [check-ins using]

︙
85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102	85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102	- + - +	# endif #endif #if defined(OF_WINDOWS) \|\| defined(OF_AMIGAOS) typedef struct { of_offset_t st_size; unsigned int st_mode; ~~~~of_t~~ime_interval_t st_atime, st_mtime, st_ctime;~~ OFTimeInterval st_atime, st_mtime, st_ctime; # ifdef OF_WINDOWS # define HAVE_STRUCT_STAT_ST_BIRTHTIME ~~~~of_t~~ime_interval_t st_birthtime;~~ OFTimeInterval st_birthtime; DWORD fileAttributes; # endif } of_stat_t; #elif defined(HAVE_STAT64) typedef struct stat64 of_stat_t; #else typedef struct stat of_stat_t;
︙
130 131 132 133 134 135 136 ~~137~~ 138 139 140 141 142 143 144	130 131 132 133 134 135 136 137 138 139 140 141 142 143 144	- +	static int (func__wutime64)(const wchar_t , struct __utimbuf64 ); static WINAPI BOOLEAN (func_CreateSymbolicLinkW)(LPCWSTR, LPCWSTR, DWORD); static WINAPI BOOLEAN (func_CreateHardLinkW)(LPCWSTR, LPCWSTR, LPSECURITY_ATTRIBUTES); #endif #ifdef OF_WINDOWS ~~static ~~of_t~~ime_interval_t~~ static OFTimeInterval filetimeToTimeInterval(const FILETIME filetime) { return (double)((int64_t)filetime->dwHighDateTime << 32 \| filetime->dwLowDateTime) / 10000000.0 - 11644473600.0; } static int
︙
258 259 260 261 262 263 264 ~~265~~ 266 267 268 269 270 271 272	258 259 260 261 262 263 264 265 266 267 268 269 270 271 272	- +	#elif defined(OF_AMIGAOS) BPTR lock; # ifdef OF_AMIGAOS4 struct ExamineData ed; # else struct FileInfoBlock fib; # endif ~~~~of_t~~ime_interval_t timeInterval;~~ OFTimeInterval timeInterval; struct Locale locale; struct DateStamp *date; if ((lock = Lock([path cStringWithEncoding: [OFLocale encoding]], SHARED_LOCK)) == 0) return retrieveError();
︙
311 312 313 314 315 316 317 ~~318~~ 319 320 321 322 323 324 325	311 312 313 314 315 316 317 318 319 320 321 322 323 324 325	- +	# ifdef OF_AMIGAOS4 date = &ed->Date; # else date = &fib.fib_Date; # endif timeInterval += date->ds_Days * 86400.0; timeInterval += date->ds_Minute * 60.0; ~~timeInterval += date->ds_Tick / (~~of_t~~ime_interval_t)TICKS_PER_SECOND;~~ timeInterval += date->ds_Tick / (OFTimeInterval)TICKS_PER_SECOND; buffer->st_atime = buffer->st_mtime = buffer->st_ctime = timeInterval; # ifdef OF_AMIGAOS4 FreeDosObject(DOS_EXAMINEDATA, ed); # endif
︙
424 425 426 427 428 429 430 ~~431~~ 432 433 434 435 436 437 438	424 425 426 427 428 429 430 431 432 433 434 435 436 437 438	- +	[attributes setObject: [NSNumber numberWithUnsignedLong: s->st_gid] forKey: of_file_attribute_key_posix_gid]; # ifdef OF_HAVE_THREADS [passwdMutex lock]; @try { # endif ~~~~of_s~~tring_encoding_t encoding = [OFLocale encoding];~~ OFStringEncoding encoding = [OFLocale encoding]; struct passwd passwd = getpwuid(s->st_uid); struct group group_ = getgrgid(s->st_gid); if (passwd != NULL) { OFString *owner = [OFString stringWithCString: passwd->pw_name encoding: encoding];
︙
460 461 462 463 464 465 466 ~~467~~ 468 469 470 471 472 473 474	460 461 462 463 464 465 466 467 468 469 470 471 472 473 474	- +	#ifdef OF_FILE_MANAGER_SUPPORTS_SYMLINKS static void setSymbolicLinkDestinationAttribute(of_mutable_file_attributes_t attributes, OFURL URL) { OFString path = URL.fileSystemRepresentation; # ifndef OF_WINDOWS ~~~~of_s~~tring_encoding_t encoding = [OFLocale encoding];~~ OFStringEncoding encoding = [OFLocale encoding]; char destinationC[PATH_MAX]; ssize_t length; OFString *destination; of_file_attribute_key_t key; length = readlink([path cStringWithEncoding: encoding], destinationC, PATH_MAX);
︙
699 700 701 702 703 704 705 ~~706~~ 707 708 709 710 711 712 713	699 700 701 702 703 704 705 706 707 708 709 710 711 712 713	- +	exceptionWithURL: URL attributes: attributes failedAttribute: attributeKey errNo: errno]; } #elif defined(OF_AMIGAOS) /* AmigaOS does not support access time. / ~~~~of_t~~ime_interval_t modificationTime =~~ OFTimeInterval modificationTime = modificationDate.timeIntervalSince1970; struct Locale locale; struct DateStamp date; modificationTime -= 252460800; /* 1978-01-01 */ if (modificationTime < 0)
︙
735 736 737 738 739 740 741 ~~742 743 744~~ 745 746 747 748 749 750 751	735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750	- - - + +	# endif @throw [OFSetItemAttributesFailedException exceptionWithURL: URL attributes: attributes failedAttribute: attributeKey errNo: retrieveError()]; #else ~~~~of_time_interval_t lastAccessTime =~~ lastAccessDate.timeIntervalSince1970; ~~of_t~~ime_interval_t modificationTime =~~ OFTimeInterval lastAccessTime = lastAccessDate.timeIntervalSince1970; OFTimeInterval modificationTime = modificationDate.timeIntervalSince1970; struct timeval times[2] = { { .tv_sec = (time_t)lastAccessTime, .tv_usec = (int)((lastAccessTime - times[0].tv_sec) * 1000000) },
︙
799 800 801 802 803 804 805 ~~806~~ 807 808 809 810 811 812 813	798 799 800 801 802 803 804 805 806 807 808 809 810 811 812	- +	attributeKey: (of_file_attribute_key_t)attributeKey attributes: (of_file_attributes_t)attributes OF_DIRECT { #ifdef OF_FILE_MANAGER_SUPPORTS_OWNER OFString *path = URL.fileSystemRepresentation; uid_t uid = -1; gid_t gid = -1; ~~~~of_s~~tring_encoding_t encoding;~~ OFStringEncoding encoding; if (owner == nil && group == nil) @throw [OFInvalidArgumentException exception]; encoding = [OFLocale encoding]; # ifdef OF_HAVE_THREADS
︙
1064 1065 1066 1067 1068 1069 1070 ~~1071~~ 1072 1073 1074 1075 1076 1077 1078	1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077	- +	exceptionWithObject: self requestedLength: 0 errNo: retrieveError()]; } @finally { FindClose(handle); } } else { ~~~~of_s~~tring_encoding_t encoding = [OFLocale encoding];~~ OFStringEncoding encoding = [OFLocale encoding]; WIN32_FIND_DATA fd; if ((handle = FindFirstFileA( [path cStringWithEncoding: encoding], &fd)) == INVALID_HANDLE_VALUE) @throw [OFOpenItemFailedException exceptionWithURL: URL
︙
1104 1105 1106 1107 1108 1109 1110 ~~1111~~ 1112 1113 1114 1115 1116 1117 1118	1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117	- +	requestedLength: 0 errNo: retrieveError()]; } @finally { FindClose(handle); } } #elif defined(OF_AMIGAOS) ~~~~of_s~~tring_encoding_t encoding = [OFLocale encoding];~~ OFStringEncoding encoding = [OFLocale encoding]; BPTR lock; if ((lock = Lock([path cStringWithEncoding: encoding], SHARED_LOCK)) == 0) @throw [OFOpenItemFailedException exceptionWithURL: URL mode: nil
︙
1174 1175 1176 1177 1178 1179 1180 ~~1181~~ 1182 1183 1184 1185 1186 1187 1188	1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187	- +	exceptionWithObject: self requestedLength: 0 errNo: retrieveError()]; } @finally { UnLock(lock); } #else ~~~~of_s~~tring_encoding_t encoding = [OFLocale encoding];~~ OFStringEncoding encoding = [OFLocale encoding]; DIR *dir; if ((dir = opendir([path cStringWithEncoding: encoding])) == NULL) @throw [OFOpenItemFailedException exceptionWithURL: URL mode: nil errNo: errno]; # if !defined(HAVE_READDIR_R) && defined(OF_HAVE_THREADS)
︙
1356 1357 1358 1359 1360 1361 1362 ~~1363~~ 1364 1365 1366 1367 1368 1369 1370	1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369	- +	![destination.scheme isEqual: _scheme]) @throw [OFInvalidArgumentException exception]; sourcePath = source.fileSystemRepresentation; destinationPath = destination.fileSystemRepresentation; # ifndef OF_WINDOWS ~~~~of_s~~tring_encoding_t encoding = [OFLocale encoding];~~ OFStringEncoding encoding = [OFLocale encoding]; if (link([sourcePath cStringWithEncoding: encoding], [destinationPath cStringWithEncoding: encoding]) != 0) @throw [OFLinkFailedException exceptionWithSourceURL: source destinationURL: destination errNo: errno];
︙
1397 1398 1399 1400 1401 1402 1403 ~~1404~~ 1405 1406 1407 1408 1409 1410 1411	1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410	- +	if (![URL.scheme isEqual: _scheme]) @throw [OFInvalidArgumentException exception]; path = URL.fileSystemRepresentation; # ifndef OF_WINDOWS ~~~~of_s~~tring_encoding_t encoding = [OFLocale encoding];~~ OFStringEncoding encoding = [OFLocale encoding]; if (symlink([target cStringWithEncoding: encoding], [path cStringWithEncoding: encoding]) != 0) @throw [OFCreateSymbolicLinkFailedException exceptionWithURL: URL target: target errNo: errno];
︙
1438 1439 1440 1441 1442 1443 1444 ~~1445~~ 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 ~~1464~~ 1465 1466 1467 1468 1469 1470 1471	1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470	- + - +	exceptionWithSourceURL: source destinationURL: destination errNo: EEXIST]; pool = objc_autoreleasePoolPush(); #ifdef OF_AMIGAOS ~~~~of_s~~tring_encoding_t encoding = [OFLocale encoding];~~ OFStringEncoding encoding = [OFLocale encoding]; if (!Rename([source.fileSystemRepresentation cStringWithEncoding: encoding], [destination.fileSystemRepresentation cStringWithEncoding: encoding])) @throw [OFMoveItemFailedException exceptionWithSourceURL: source destinationURL: destination errNo: retrieveError()]; #else int status; # ifdef OF_WINDOWS if ([OFSystemInfo isWindowsNT]) status = _wrename(source.fileSystemRepresentation.UTF16String, destination.fileSystemRepresentation.UTF16String); else { # endif ~~~~of_s~~tring_encoding_t encoding = [OFLocale encoding];~~ OFStringEncoding encoding = [OFLocale encoding]; status = rename([source.fileSystemRepresentation cStringWithEncoding: encoding], [destination.fileSystemRepresentation cStringWithEncoding: encoding]); # ifdef OF_WINDOWS }
︙

ObjFW Diff

Differences From Artifact [db7a703dd2]:

To Artifact [48c2c95cb9]: