Differences From Artifact [dfdfaa21fd]:
- File src/OFURL.m — part of check-in [b2ee854268] at 2017-11-14 00:23:14 on branch trunk — OFURL: Always verify the URL-encoded versions (user: js, size: 21255) [annotate] [blame] [check-ins using]
To Artifact [18e5b35188]:
- File
src/OFURL.m
— part of check-in
[e2f6ad3876]
at
2017-11-14 22:50:45
on branch trunk
— OFURL: Improve -[initFileURLWithPath:]
This now doesn't use -[initWithString:relativeToURL:] anymore and
properly escapes everything. (user: js, size: 21514) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
627 628 629 630 631 632 633 634 635 636 637 638 639 |
return self;
}
- (instancetype)initFileURLWithPath: (OFString *)path
isDirectory: (bool)isDirectory
{
@try {
void *pool = objc_autoreleasePoolPush();
# if OF_PATH_DELIMITER != '/' || defined(OF_WINDOWS) || defined(OF_DJGPP)
OFArray OF_GENERIC(OFString *) *pathComponents =
[path pathComponents];
# endif
| > > < > > > | | | | > > > > > > | 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 |
return self;
}
- (instancetype)initFileURLWithPath: (OFString *)path
isDirectory: (bool)isDirectory
{
self = [super init];
@try {
void *pool = objc_autoreleasePoolPush();
# if OF_PATH_DELIMITER != '/' || defined(OF_WINDOWS) || defined(OF_DJGPP)
OFArray OF_GENERIC(OFString *) *pathComponents =
[path pathComponents];
# endif
# if OF_PATH_DELIMITER != '/'
path = [pathComponents componentsJoinedByString: @"/"];
# endif
# if defined(OF_WINDOWS) || defined(OF_DJGPP)
if ([[pathComponents firstObject] hasSuffix: @":"])
path = [path stringByPrependingString: @"/"];
# endif
if (isDirectory && ![path hasSuffix: OF_PATH_DELIMITER_STRING])
path = [path stringByAppendingString: @"/"];
_URLEncodedScheme = @"file";
if (![path hasPrefix: @"/"]) {
OFString *currentDirectoryPath = [[OFFileManager
defaultManager] currentDirectoryPath];
path = [OFString stringWithFormat:
@"%@/%@", currentDirectoryPath, path];
path = [path stringByStandardizingURLPath];
}
_URLEncodedPath = [[path
stringByURLEncodingWithAllowedCharacters:
[OFCharacterSet URLPathAllowedCharacterSet]] copy];
objc_autoreleasePoolPop(pool);
} @catch (id e) {
[self release];
@throw e;
}
|
| ︙ | ︙ |