Overview
| Comment: | -[initWithContentsOfFile:]: Avoid stat call |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
93f0d2a78fee1b174a75e8876d8e32a4 |
| User & Date: | js on 2022-10-20 16:37:26 |
| Other Links: | manifest | tags |
Context
|
2022-10-20
| ||
| 18:58 | Document more exceptions check-in: 7538082267 user: js tags: trunk | |
| 16:37 | -[initWithContentsOfFile:]: Avoid stat call check-in: 93f0d2a78f user: js tags: trunk | |
| 13:16 | Document more exceptions check-in: 9cc462339e user: js tags: trunk | |
Changes
Modified src/OFData.m from [9d8368a480] to [b0fcc38dae].
| ︙ | ︙ | |||
171 172 173 174 175 176 177 |
return self;
}
#ifdef OF_HAVE_FILES
- (instancetype)initWithContentsOfFile: (OFString *)path
{
char *buffer = NULL;
| | > | | < < < | | > | < < | < < | > | | 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 |
return self;
}
#ifdef OF_HAVE_FILES
- (instancetype)initWithContentsOfFile: (OFString *)path
{
char *buffer = NULL;
OFStreamOffset fileSize;
@try {
void *pool = objc_autoreleasePoolPush();
OFFile *file = [OFFile fileWithPath: path mode: @"r"];
fileSize = [file seekToOffset: 0 whence: OFSeekEnd];
if (fileSize < 0 || (unsigned long long)fileSize > SIZE_MAX)
@throw [OFOutOfRangeException exception];
[file seekToOffset: 0 whence: OFSeekSet];
buffer = OFAllocMemory((size_t)fileSize, 1);
[file readIntoBuffer: buffer exactLength: (size_t)fileSize];
objc_autoreleasePoolPop(pool);
} @catch (id e) {
OFFreeMemory(buffer);
[self release];
@throw e;
}
@try {
self = [self initWithItemsNoCopy: buffer
count: (size_t)fileSize
freeWhenDone: true];
} @catch (id e) {
OFFreeMemory(buffer);
@throw e;
}
return self;
|
| ︙ | ︙ |
Modified src/OFString.m from [66ea400d53] to [03372dc363].
| ︙ | ︙ | |||
990 991 992 993 994 995 996 |
return [self initWithContentsOfFile: path
encoding: OFStringEncodingUTF8];
}
- (instancetype)initWithContentsOfFile: (OFString *)path
encoding: (OFStringEncoding)encoding
{
| | | | | < < < < < < < < | < < < < | < > > | < < | | > > | | < < | | < < < < | | | | | 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 |
return [self initWithContentsOfFile: path
encoding: OFStringEncodingUTF8];
}
- (instancetype)initWithContentsOfFile: (OFString *)path
encoding: (OFStringEncoding)encoding
{
char *buffer = NULL;
OFStreamOffset fileSize;
@try {
void *pool = objc_autoreleasePoolPush();
OFFile *file = [OFFile fileWithPath: path mode: @"r"];
fileSize = [file seekToOffset: 0 whence: OFSeekEnd];
if (fileSize < 0 || (unsigned long long)fileSize > SIZE_MAX)
@throw [OFOutOfRangeException exception];
/*
* We need one extra byte for the terminating zero if we want
* to use -[initWithUTF8StringNoCopy:length:freeWhenDone:].
*/
if (SIZE_MAX - (size_t)fileSize < 1)
@throw [OFOutOfRangeException exception];
[file seekToOffset: 0 whence: OFSeekSet];
buffer = OFAllocMemory((size_t)fileSize + 1, 1);
[file readIntoBuffer: buffer exactLength: (size_t)fileSize];
buffer[(size_t)fileSize] = '\0';
objc_autoreleasePoolPop(pool);
} @catch (id e) {
OFFreeMemory(buffer);
[self release];
@throw e;
}
if (encoding == OFStringEncodingUTF8) {
@try {
self = [self initWithUTF8StringNoCopy: buffer
length: (size_t)fileSize
freeWhenDone: true];
} @catch (id e) {
OFFreeMemory(buffer);
@throw e;
}
} else {
@try {
self = [self initWithCString: buffer
encoding: encoding
length: (size_t)fileSize];
} @finally {
OFFreeMemory(buffer);
}
}
return self;
}
#endif
|
| ︙ | ︙ |