Differences From Artifact [3f6812e137]:
- File src/OFFileManager.m — part of check-in [7c2b71f536] at 2016-04-24 16:58:59 on branch trunk — OFFileManager: Fix nil that should be NULL (user: js, size: 21722) [annotate] [blame] [check-ins using]
To Artifact [828aa0d8f5]:
- File
src/OFFileManager.m
— part of check-in
[c52e685523]
at
2016-07-03 18:22:12
on branch trunk
— OFFileManager: Replace remove with unlink / rmdir
remove() is supposed to delete both, files and directories, but
unfortunately, on Windows it only works for files. Since there is an if
on the type anyway, use unlink() / rmdir() instead. (user: js, size: 21990) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
846 847 848 849 850 851 852 | void *pool2 = objc_autoreleasePoolPush(); [self removeItemAtPath: [path stringByAppendingPathComponent: item]]; objc_autoreleasePoolPop(pool2); } | | | > > > > > > > > > | | | | > | > | 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 |
void *pool2 = objc_autoreleasePoolPush();
[self removeItemAtPath:
[path stringByAppendingPathComponent: item]];
objc_autoreleasePoolPop(pool2);
}
#ifndef OF_WINDOWS
if (rmdir([path cStringWithEncoding:
[OFSystemInfo native8BitEncoding]]) != 0)
#else
if (_wrmdir([path UTF16String]) != 0)
#endif
@throw [OFRemoveItemFailedException
exceptionWithPath: path
errNo: errno];
} else {
#ifndef OF_WINDOWS
if (unlink([path cStringWithEncoding:
[OFSystemInfo native8BitEncoding]]) != 0)
#else
if (_wunlink([path UTF16String]) != 0)
#endif
@throw [OFRemoveItemFailedException
exceptionWithPath: path
errNo: errno];
}
objc_autoreleasePoolPop(pool);
}
#ifdef OF_HAVE_LINK
- (void)linkItemAtPath: (OFString*)source
toPath: (OFString*)destination
|
| ︙ | ︙ |