Differences From Artifact [e46a299ae7]:
- File
src/OFFile.m
— part of check-in
[feaf3faad5]
at
2013-12-15 17:56:32
on branch trunk
— OFFile: Require a full path for (sym)links.
This was forgotten when copy and move were changed. (user: js, size: 20519) [annotate] [blame] [check-ins using]
To Artifact [2af7091a44]:
- File src/OFFile.m — part of check-in [09d0cd7ac5] at 2013-12-15 17:57:14 on branch trunk — OFFile: Code cleanup. (user: js, size: 20238) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
563 564 565 566 567 568 569 | exceptionWithSourcePath: source destinationPath: destination]; } enumerator = [contents objectEnumerator]; while ((item = [enumerator nextObject]) != nil) { void *pool2 = objc_autoreleasePoolPush(); | < < < | | < < | | | 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 | exceptionWithSourcePath: source destinationPath: destination]; } enumerator = [contents objectEnumerator]; while ((item = [enumerator nextObject]) != nil) { void *pool2 = objc_autoreleasePoolPush(); OFString *sourcePath, *destinationPath; sourcePath = [source stringByAppendingPathComponent: item]; destinationPath = [destination stringByAppendingPathComponent: item]; [OFFile copyItemAtPath: sourcePath toPath: destinationPath]; objc_autoreleasePoolPop(pool2); } } else if (S_ISREG(s.st_mode)) { |
︙ | ︙ | |||
719 720 721 722 723 724 725 | @throw [OFRemoveItemFailedException exceptionWithPath: path]; } enumerator = [contents objectEnumerator]; while ((item = [enumerator nextObject]) != nil) { void *pool2 = objc_autoreleasePoolPush(); | < < < < < < | > | 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 | @throw [OFRemoveItemFailedException exceptionWithPath: path]; } enumerator = [contents objectEnumerator]; while ((item = [enumerator nextObject]) != nil) { void *pool2 = objc_autoreleasePoolPush(); [OFFile removeItemAtPath: [path stringByAppendingPathComponent: item]]; objc_autoreleasePoolPop(pool2); } } #ifndef _WIN32 if (remove([path cStringWithEncoding: OF_STRING_ENCODING_NATIVE])) |
︙ | ︙ |