Differences From Artifact [cd0c9b6190]:
- File src/OFFileManager.m — part of check-in [7e5c81e186] at 2018-01-03 19:49:46 on branch trunk — Update copyright notice (user: js, size: 21859) [annotate] [blame] [check-ins using]
To Artifact [06ca9c602c]:
- File
src/OFFileManager.m
— part of check-in
[d133fa0a89]
at
2018-02-11 14:33:16
on branch trunk
— Add exception for currentDirectoryPath failing
This also changes OFFileManager to use a buffer with getcwd() rather
than depending on the extension that passing NULL as a buffer will
allocate one. (user: js, size: 21951) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
31 32 33 34 35 36 37 38 39 40 41 42 43 44 | #import "OFString.h" #import "OFSystemInfo.h" #import "OFURL.h" #import "OFURLHandler.h" #import "OFChangeCurrentDirectoryPathFailedException.h" #import "OFCopyItemFailedException.h" #import "OFInvalidArgumentException.h" #import "OFMoveItemFailedException.h" #import "OFOutOfMemoryException.h" #import "OFOutOfRangeException.h" #import "OFRemoveItemFailedException.h" #import "OFRetrieveItemAttributesFailedException.h" #import "OFUndefinedKeyException.h" | > | 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 | #import "OFString.h" #import "OFSystemInfo.h" #import "OFURL.h" #import "OFURLHandler.h" #import "OFChangeCurrentDirectoryPathFailedException.h" #import "OFCopyItemFailedException.h" #import "OFGetCurrentDirectoryPathFailedException.h" #import "OFInvalidArgumentException.h" #import "OFMoveItemFailedException.h" #import "OFOutOfMemoryException.h" #import "OFOutOfRangeException.h" #import "OFRemoveItemFailedException.h" #import "OFRetrieveItemAttributesFailedException.h" #import "OFUndefinedKeyException.h" |
| ︙ | ︙ | |||
155 156 157 158 159 160 161 | return nil; } return [OFString stringWithCString: buffer encoding: [OFLocalization encoding]]; #else | < | > | > | | | < < < < < | 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 |
return nil;
}
return [OFString stringWithCString: buffer
encoding: [OFLocalization encoding]];
#else
char buffer[PATH_MAX];
if ((getcwd(buffer, PATH_MAX)) == NULL)
@throw [OFGetCurrentDirectoryPathFailedException
exceptionWithErrNo: errno];
return [OFString stringWithCString: buffer
encoding: [OFLocalization encoding]];
#endif
}
- (OFURL *)currentDirectoryURL
{
OFMutableURL *URL = [OFMutableURL URL];
void *pool = objc_autoreleasePoolPush();
|
| ︙ | ︙ |