From: Apple Date: Tue, 11 Mar 2014 21:01:23 +0000 (+0000) Subject: CF-855.14.tar.gz X-Git-Tag: os-x-1092^0 X-Git-Url: https://git.saurik.com/apple/cf.git/commitdiff_plain/d8b101a4f6aa03fafcaee9105fbfdea9132c942c?ds=inline CF-855.14.tar.gz --- diff --git a/CFApplicationPreferences.c b/CFApplicationPreferences.c index ab38b88..123a75d 100644 --- a/CFApplicationPreferences.c +++ b/CFApplicationPreferences.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFArray.c b/CFArray.c index c49eb78..e5ab952 100644 --- a/CFArray.c +++ b/CFArray.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFArray.h b/CFArray.h index 2eaa4f0..b5fdd36 100644 --- a/CFArray.h +++ b/CFArray.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFAvailability.h b/CFAvailability.h index aaf0236..25042bf 100644 --- a/CFAvailability.h +++ b/CFAvailability.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBag.c b/CFBag.c index 15e0a7a..629f927 100644 --- a/CFBag.c +++ b/CFBag.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBag.h b/CFBag.h index 1547816..53803f9 100644 --- a/CFBag.h +++ b/CFBag.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBase.c b/CFBase.c index 84cb602..6398d06 100644 --- a/CFBase.c +++ b/CFBase.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBase.h b/CFBase.h index 7a83135..ffddd2b 100644 --- a/CFBase.h +++ b/CFBase.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBasicHash.c b/CFBasicHash.c index 074a505..3222c96 100644 --- a/CFBasicHash.c +++ b/CFBasicHash.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBasicHash.h b/CFBasicHash.h index 362d6c9..5da451b 100644 --- a/CFBasicHash.h +++ b/CFBasicHash.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBasicHashFindBucket.m b/CFBasicHashFindBucket.m index bbc87a9..6cd272c 100644 --- a/CFBasicHashFindBucket.m +++ b/CFBasicHashFindBucket.m @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBigNumber.c b/CFBigNumber.c index cfe2c77..3ae50ae 100644 --- a/CFBigNumber.c +++ b/CFBigNumber.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBigNumber.h b/CFBigNumber.h index 26ec11f..bc03391 100644 --- a/CFBigNumber.h +++ b/CFBigNumber.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBinaryHeap.c b/CFBinaryHeap.c index 06a98e7..7abafcf 100644 --- a/CFBinaryHeap.c +++ b/CFBinaryHeap.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBinaryHeap.h b/CFBinaryHeap.h index ccccf55..6881891 100644 --- a/CFBinaryHeap.h +++ b/CFBinaryHeap.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBinaryPList.c b/CFBinaryPList.c index 8a1e56a..9707cc9 100644 --- a/CFBinaryPList.c +++ b/CFBinaryPList.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBitVector.c b/CFBitVector.c index 983369e..8c562e8 100644 --- a/CFBitVector.c +++ b/CFBitVector.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBitVector.h b/CFBitVector.h index c8b8614..73a965c 100644 --- a/CFBitVector.h +++ b/CFBitVector.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBuiltinConverters.c b/CFBuiltinConverters.c index cc2bdb0..b75dbbe 100644 --- a/CFBuiltinConverters.c +++ b/CFBuiltinConverters.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBundle.c b/CFBundle.c index a5b64b5..a7266ac 100644 --- a/CFBundle.c +++ b/CFBundle.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBundle.h b/CFBundle.h index 99d33e2..36b727e 100644 --- a/CFBundle.h +++ b/CFBundle.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBundlePriv.h b/CFBundlePriv.h index b989e7a..b8547fe 100644 --- a/CFBundlePriv.h +++ b/CFBundlePriv.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBundle_BinaryTypes.h b/CFBundle_BinaryTypes.h index b1cc238..8629306 100644 --- a/CFBundle_BinaryTypes.h +++ b/CFBundle_BinaryTypes.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBundle_InfoPlist.c b/CFBundle_InfoPlist.c index f7d51a7..6e48d72 100644 --- a/CFBundle_InfoPlist.c +++ b/CFBundle_InfoPlist.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBundle_Internal.h b/CFBundle_Internal.h index 1d1ca84..9f2f7a8 100644 --- a/CFBundle_Internal.h +++ b/CFBundle_Internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBundle_Resources.c b/CFBundle_Resources.c index 4bc74f5..e7e4172 100644 --- a/CFBundle_Resources.c +++ b/CFBundle_Resources.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBurstTrie.c b/CFBurstTrie.c index 16fa515..498e16d 100644 --- a/CFBurstTrie.c +++ b/CFBurstTrie.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFBurstTrie.h b/CFBurstTrie.h index 161a349..12d5e3d 100644 --- a/CFBurstTrie.h +++ b/CFBurstTrie.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFByteOrder.h b/CFByteOrder.h index ea507a3..b9e6014 100644 --- a/CFByteOrder.h +++ b/CFByteOrder.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFCalendar.c b/CFCalendar.c index cde70e7..a4c2c90 100644 --- a/CFCalendar.c +++ b/CFCalendar.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFCalendar.h b/CFCalendar.h index ac2b379..433c415 100644 --- a/CFCalendar.h +++ b/CFCalendar.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFCharacterSet.c b/CFCharacterSet.c index 8c55bbf..9b4ab0b 100644 --- a/CFCharacterSet.c +++ b/CFCharacterSet.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFCharacterSet.h b/CFCharacterSet.h index f31eff4..97c9f0e 100644 --- a/CFCharacterSet.h +++ b/CFCharacterSet.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFCharacterSetBitmaps.bitmap b/CFCharacterSetBitmaps.bitmap index a80d388..50b16f1 100644 Binary files a/CFCharacterSetBitmaps.bitmap and b/CFCharacterSetBitmaps.bitmap differ diff --git a/CFCharacterSetPriv.h b/CFCharacterSetPriv.h index cd3dfd0..a132885 100644 --- a/CFCharacterSetPriv.h +++ b/CFCharacterSetPriv.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFConcreteStreams.c b/CFConcreteStreams.c index 00ff49a..16278f0 100644 --- a/CFConcreteStreams.c +++ b/CFConcreteStreams.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFData.c b/CFData.c index 9d2732b..e14b64e 100644 --- a/CFData.c +++ b/CFData.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFData.h b/CFData.h index 7b2394b..d81a3b5 100644 --- a/CFData.h +++ b/CFData.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFDate.c b/CFDate.c index be8b511..79c439b 100644 --- a/CFDate.c +++ b/CFDate.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFDate.h b/CFDate.h index f019e0a..5b5369a 100644 --- a/CFDate.h +++ b/CFDate.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFDateFormatter.c b/CFDateFormatter.c index 80f2701..e539e91 100644 --- a/CFDateFormatter.c +++ b/CFDateFormatter.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFDateFormatter.h b/CFDateFormatter.h index d88a212..81b4259 100644 --- a/CFDateFormatter.h +++ b/CFDateFormatter.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFDictionary.c b/CFDictionary.c index b689e99..e5fa4a7 100644 --- a/CFDictionary.c +++ b/CFDictionary.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFDictionary.h b/CFDictionary.h index 312f1d7..17bd863 100644 --- a/CFDictionary.h +++ b/CFDictionary.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFError.c b/CFError.c index 00db595..c9c6541 100644 --- a/CFError.c +++ b/CFError.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFError.h b/CFError.h index 8602290..7eba225 100644 --- a/CFError.h +++ b/CFError.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFError_Private.h b/CFError_Private.h index f370523..ed7c8c8 100644 --- a/CFError_Private.h +++ b/CFError_Private.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFFileUtilities.c b/CFFileUtilities.c index 9723263..58a9dbf 100644 --- a/CFFileUtilities.c +++ b/CFFileUtilities.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFICUConverters.c b/CFICUConverters.c index 931b11e..52af14e 100644 --- a/CFICUConverters.c +++ b/CFICUConverters.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFICUConverters.h b/CFICUConverters.h index 9d1cfef..19556a7 100644 --- a/CFICUConverters.h +++ b/CFICUConverters.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFICULogging.h b/CFICULogging.h index 8673e85..7b69f51 100644 --- a/CFICULogging.h +++ b/CFICULogging.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFInternal.h b/CFInternal.h index 2204025..66dc507 100644 --- a/CFInternal.h +++ b/CFInternal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFLocale.c b/CFLocale.c index b9a840c..e8cc764 100644 --- a/CFLocale.c +++ b/CFLocale.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFLocale.h b/CFLocale.h index b8d3383..3ea3b99 100644 --- a/CFLocale.h +++ b/CFLocale.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFLocaleIdentifier.c b/CFLocaleIdentifier.c index 496c907..593b649 100644 --- a/CFLocaleIdentifier.c +++ b/CFLocaleIdentifier.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFLocaleInternal.h b/CFLocaleInternal.h index 7b0134a..48fcf38 100644 --- a/CFLocaleInternal.h +++ b/CFLocaleInternal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFLocaleKeys.c b/CFLocaleKeys.c index 6d79c89..000051b 100644 --- a/CFLocaleKeys.c +++ b/CFLocaleKeys.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFLogUtilities.h b/CFLogUtilities.h index 896f4b2..f1da61e 100644 --- a/CFLogUtilities.h +++ b/CFLogUtilities.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFMachPort.c b/CFMachPort.c index a8479e1..24c2aa4 100644 --- a/CFMachPort.c +++ b/CFMachPort.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFMachPort.h b/CFMachPort.h index 605c92e..86c88f4 100644 --- a/CFMachPort.h +++ b/CFMachPort.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFMessagePort.c b/CFMessagePort.c index 385a7bc..e8447df 100644 --- a/CFMessagePort.c +++ b/CFMessagePort.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFMessagePort.h b/CFMessagePort.h index 6112e49..c00c60a 100644 --- a/CFMessagePort.h +++ b/CFMessagePort.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFNumber.c b/CFNumber.c index f945444..ae4147c 100644 --- a/CFNumber.c +++ b/CFNumber.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFNumber.h b/CFNumber.h index 2792e27..2249d9c 100644 --- a/CFNumber.h +++ b/CFNumber.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFNumberFormatter.c b/CFNumberFormatter.c index dbb63df..6dbe697 100644 --- a/CFNumberFormatter.c +++ b/CFNumberFormatter.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFNumberFormatter.h b/CFNumberFormatter.h index f9eded1..ce38a6b 100644 --- a/CFNumberFormatter.h +++ b/CFNumberFormatter.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFOldStylePList.c b/CFOldStylePList.c index 1882efa..3398658 100644 --- a/CFOldStylePList.c +++ b/CFOldStylePList.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFPlatform.c b/CFPlatform.c index aca99b2..348024a 100644 --- a/CFPlatform.c +++ b/CFPlatform.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFPlatformConverters.c b/CFPlatformConverters.c index fc264d5..071b97f 100644 --- a/CFPlatformConverters.c +++ b/CFPlatformConverters.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFPlugIn.c b/CFPlugIn.c index c1e7b85..0f0ef1a 100644 --- a/CFPlugIn.c +++ b/CFPlugIn.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFPlugIn.h b/CFPlugIn.h index c440e00..72fe4f5 100644 --- a/CFPlugIn.h +++ b/CFPlugIn.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFPlugInCOM.h b/CFPlugInCOM.h index b06469e..62a88f1 100644 --- a/CFPlugInCOM.h +++ b/CFPlugInCOM.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFPlugIn_Factory.c b/CFPlugIn_Factory.c index 82e59b4..e65cf92 100644 --- a/CFPlugIn_Factory.c +++ b/CFPlugIn_Factory.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFPlugIn_Factory.h b/CFPlugIn_Factory.h index 8f94abf..15ff7af 100644 --- a/CFPlugIn_Factory.h +++ b/CFPlugIn_Factory.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFPlugIn_Instance.c b/CFPlugIn_Instance.c index 252b45a..3eebd0c 100644 --- a/CFPlugIn_Instance.c +++ b/CFPlugIn_Instance.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFPlugIn_PlugIn.c b/CFPlugIn_PlugIn.c index 6ba9a07..fdcf7c5 100644 --- a/CFPlugIn_PlugIn.c +++ b/CFPlugIn_PlugIn.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFPreferences.c b/CFPreferences.c index 50637c4..c8cc416 100644 --- a/CFPreferences.c +++ b/CFPreferences.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFPreferences.h b/CFPreferences.h index aa2c154..c572ec6 100644 --- a/CFPreferences.h +++ b/CFPreferences.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFPriv.h b/CFPriv.h index 6957d7a..9753c9d 100644 --- a/CFPriv.h +++ b/CFPriv.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFPropertyList.c b/CFPropertyList.c index 0ff03e4..d93b7e2 100644 --- a/CFPropertyList.c +++ b/CFPropertyList.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFPropertyList.h b/CFPropertyList.h index 99ba0a7..9b3af33 100644 --- a/CFPropertyList.h +++ b/CFPropertyList.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFRunLoop.c b/CFRunLoop.c index 1566156..e83ddbf 100644 --- a/CFRunLoop.c +++ b/CFRunLoop.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFRunLoop.h b/CFRunLoop.h index 2744ea1..855e82a 100644 --- a/CFRunLoop.h +++ b/CFRunLoop.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFRuntime.c b/CFRuntime.c index cb2d3fb..fe3ca57 100644 --- a/CFRuntime.c +++ b/CFRuntime.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFRuntime.h b/CFRuntime.h index 3e23515..ae0a800 100644 --- a/CFRuntime.h +++ b/CFRuntime.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFSet.c b/CFSet.c index fff082a..a5099d0 100644 --- a/CFSet.c +++ b/CFSet.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFSet.h b/CFSet.h index 538d9dc..6fede10 100644 --- a/CFSet.h +++ b/CFSet.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFSocket.c b/CFSocket.c index 3bce445..44cd67c 100644 --- a/CFSocket.c +++ b/CFSocket.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFSocket.h b/CFSocket.h index b8d0803..c4b9346 100644 --- a/CFSocket.h +++ b/CFSocket.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFSocketStream.c b/CFSocketStream.c index 662858e..c9b3768 100644 --- a/CFSocketStream.c +++ b/CFSocketStream.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFSortFunctions.c b/CFSortFunctions.c index 5e5e74f..ed64d3c 100644 --- a/CFSortFunctions.c +++ b/CFSortFunctions.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStorage.c b/CFStorage.c index 7f6ceaa..fa30231 100644 --- a/CFStorage.c +++ b/CFStorage.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStorage.h b/CFStorage.h index eb455ba..fb59f1d 100644 --- a/CFStorage.h +++ b/CFStorage.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStream.c b/CFStream.c index 60f3242..960b0a3 100644 --- a/CFStream.c +++ b/CFStream.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStream.h b/CFStream.h index 4db4edf..36103b4 100644 --- a/CFStream.h +++ b/CFStream.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStreamAbstract.h b/CFStreamAbstract.h index f126887..1844aad 100644 --- a/CFStreamAbstract.h +++ b/CFStreamAbstract.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStreamInternal.h b/CFStreamInternal.h index 72cbe9d..2eeca1b 100644 --- a/CFStreamInternal.h +++ b/CFStreamInternal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStreamPriv.h b/CFStreamPriv.h index 15f9bec..ee28125 100644 --- a/CFStreamPriv.h +++ b/CFStreamPriv.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFString.c b/CFString.c index a852643..8009185 100644 --- a/CFString.c +++ b/CFString.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFString.h b/CFString.h index 8fe267d..61ce9ef 100644 --- a/CFString.h +++ b/CFString.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStringDefaultEncoding.h b/CFStringDefaultEncoding.h index e7c21eb..37237a3 100644 --- a/CFStringDefaultEncoding.h +++ b/CFStringDefaultEncoding.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStringEncodingConverter.c b/CFStringEncodingConverter.c index 62a116c..c026633 100644 --- a/CFStringEncodingConverter.c +++ b/CFStringEncodingConverter.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStringEncodingConverter.h b/CFStringEncodingConverter.h index 2357ac2..1803c32 100644 --- a/CFStringEncodingConverter.h +++ b/CFStringEncodingConverter.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStringEncodingConverterExt.h b/CFStringEncodingConverterExt.h index 2415c6a..16a1efe 100644 --- a/CFStringEncodingConverterExt.h +++ b/CFStringEncodingConverterExt.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStringEncodingConverterPriv.h b/CFStringEncodingConverterPriv.h index faab37c..175a1f3 100644 --- a/CFStringEncodingConverterPriv.h +++ b/CFStringEncodingConverterPriv.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStringEncodingDatabase.c b/CFStringEncodingDatabase.c index 2e1845b..06a206b 100644 --- a/CFStringEncodingDatabase.c +++ b/CFStringEncodingDatabase.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStringEncodingDatabase.h b/CFStringEncodingDatabase.h index f908e14..c6bd0c9 100644 --- a/CFStringEncodingDatabase.h +++ b/CFStringEncodingDatabase.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStringEncodingExt.h b/CFStringEncodingExt.h index 8dc4164..06668f1 100644 --- a/CFStringEncodingExt.h +++ b/CFStringEncodingExt.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStringEncodings.c b/CFStringEncodings.c index 2dc9e94..d19013e 100644 --- a/CFStringEncodings.c +++ b/CFStringEncodings.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStringScanner.c b/CFStringScanner.c index 980e142..daff3e6 100644 --- a/CFStringScanner.c +++ b/CFStringScanner.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFStringUtilities.c b/CFStringUtilities.c index 507b37d..ea3939e 100644 --- a/CFStringUtilities.c +++ b/CFStringUtilities.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFSystemDirectories.c b/CFSystemDirectories.c index 51a2da7..c3fdfc1 100644 --- a/CFSystemDirectories.c +++ b/CFSystemDirectories.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFTimeZone.c b/CFTimeZone.c index 62460e2..8c0a7e1 100644 --- a/CFTimeZone.c +++ b/CFTimeZone.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFTimeZone.h b/CFTimeZone.h index 4272729..d31faab 100644 --- a/CFTimeZone.h +++ b/CFTimeZone.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFTree.c b/CFTree.c index 1fe4f0e..8579864 100644 --- a/CFTree.c +++ b/CFTree.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFTree.h b/CFTree.h index 41a21a6..c69b005 100644 --- a/CFTree.h +++ b/CFTree.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFURL.c b/CFURL.c index 4407e3b..b1f549e 100644 --- a/CFURL.c +++ b/CFURL.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * @@ -2220,61 +2220,63 @@ CF_EXPORT Boolean _CFURLInitWithFileSystemRepresentation(CFURLRef uninitializedU memcpy(input_buffer, buffer, bufLen); #endif Boolean result = false; - CFAllocatorRef alloc = CFGetAllocator(uninitializedURL); + if ( bufLen > 0 ) { + CFAllocatorRef alloc = CFGetAllocator(uninitializedURL); #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX - struct __CFURL *url = (struct __CFURL *)uninitializedURL; - Boolean isAbsolute = bufLen && (*buffer == '/'); - Boolean addedPercentEncoding; - Boolean releaseBaseURL = false; - - if ( isAbsolute ) { - // if buffer contains an absolute path, ignore baseURL (if provided) - baseURL = NULL; - } - else if ( baseURL == NULL ) { - // if buffer contains a relative path and no baseURL is provided, use the current working directory - baseURL = _CFURLCreateCurrentDirectoryURL(CFGetAllocator(uninitializedURL)); - releaseBaseURL = true; - } - CFStringRef urlString = CreateStringFromFileSystemRepresentationByAddingPercentEscapes(alloc, buffer, bufLen, isDirectory, isAbsolute, false /*windowsPath*/, &addedPercentEncoding); - if ( urlString ) { - _CFURLInit(url, urlString, baseURL, FALSE); + struct __CFURL *url = (struct __CFURL *)uninitializedURL; + Boolean isAbsolute = bufLen && (*buffer == '/'); + Boolean addedPercentEncoding; + Boolean releaseBaseURL = false; - // hard coded parse if ( isAbsolute ) { - if ( AddAuthorityToFileURL() ) { - url->_flags = (addedPercentEncoding ? 0 : POSIX_AND_URL_PATHS_MATCH ) | (isDirectory ? IS_DIRECTORY : 0) | IS_DECOMPOSABLE | HAS_SCHEME | HAS_HOST | HAS_PATH | ORIGINAL_AND_URL_STRINGS_MATCH | IS_CANONICAL_FILE_URL; - _setSchemeTypeInFlags(&url->_flags, kHasFileScheme); - url->_ranges = (CFRange *)CFAllocatorAllocate(alloc, sizeof(CFRange) * 3, 0); - url->_ranges[0] = CFRangeMake(0, 4); // scheme "file" - url->_ranges[1] = CFRangeMake(7, 9); // host "localhost" - url->_ranges[2] = CFRangeMake(16, CFStringGetLength(urlString)- 16); + // if buffer contains an absolute path, ignore baseURL (if provided) + baseURL = NULL; + } + else if ( baseURL == NULL ) { + // if buffer contains a relative path and no baseURL is provided, use the current working directory + baseURL = _CFURLCreateCurrentDirectoryURL(CFGetAllocator(uninitializedURL)); + releaseBaseURL = true; + } + CFStringRef urlString = CreateStringFromFileSystemRepresentationByAddingPercentEscapes(alloc, buffer, bufLen, isDirectory, isAbsolute, false /*windowsPath*/, &addedPercentEncoding); + if ( urlString ) { + _CFURLInit(url, urlString, baseURL, FALSE); + + // hard coded parse + if ( isAbsolute ) { + if ( AddAuthorityToFileURL() ) { + url->_flags = (addedPercentEncoding ? 0 : POSIX_AND_URL_PATHS_MATCH ) | (isDirectory ? IS_DIRECTORY : 0) | IS_DECOMPOSABLE | HAS_SCHEME | HAS_HOST | HAS_PATH | ORIGINAL_AND_URL_STRINGS_MATCH | IS_CANONICAL_FILE_URL; + _setSchemeTypeInFlags(&url->_flags, kHasFileScheme); + url->_ranges = (CFRange *)CFAllocatorAllocate(alloc, sizeof(CFRange) * 3, 0); + url->_ranges[0] = CFRangeMake(0, 4); // scheme "file" + url->_ranges[1] = CFRangeMake(7, 9); // host "localhost" + url->_ranges[2] = CFRangeMake(16, CFStringGetLength(urlString)- 16); + } + else { + url->_flags = (addedPercentEncoding ? 0 : POSIX_AND_URL_PATHS_MATCH ) | (isDirectory ? IS_DIRECTORY : 0) | IS_DECOMPOSABLE | HAS_SCHEME | HAS_PATH | ORIGINAL_AND_URL_STRINGS_MATCH | IS_CANONICAL_FILE_URL; + _setSchemeTypeInFlags(&url->_flags, kHasFileScheme); + url->_ranges = (CFRange *)CFAllocatorAllocate(alloc, sizeof(CFRange) * 2, 0); + url->_ranges[0] = CFRangeMake(0, 4); // scheme "file" + url->_ranges[1] = CFRangeMake(7, CFStringGetLength(urlString)- 7); + } + } else { + url->_flags = (addedPercentEncoding ? 0 : POSIX_AND_URL_PATHS_MATCH ) | (isDirectory ? IS_DIRECTORY : 0) | IS_DECOMPOSABLE | HAS_PATH | ORIGINAL_AND_URL_STRINGS_MATCH; + url->_ranges = (CFRange *)CFAllocatorAllocate(alloc, sizeof(CFRange), 0); + *(url->_ranges) = CFRangeMake(0, CFStringGetLength(url->_string)); } - else { - url->_flags = (addedPercentEncoding ? 0 : POSIX_AND_URL_PATHS_MATCH ) | (isDirectory ? IS_DIRECTORY : 0) | IS_DECOMPOSABLE | HAS_SCHEME | HAS_PATH | ORIGINAL_AND_URL_STRINGS_MATCH | IS_CANONICAL_FILE_URL; - _setSchemeTypeInFlags(&url->_flags, kHasFileScheme); - url->_ranges = (CFRange *)CFAllocatorAllocate(alloc, sizeof(CFRange) * 2, 0); - url->_ranges[0] = CFRangeMake(0, 4); // scheme "file" - url->_ranges[1] = CFRangeMake(7, CFStringGetLength(urlString)- 7); + if ( releaseBaseURL && baseURL ) { + CFRelease(baseURL); } - } else { - url->_flags = (addedPercentEncoding ? 0 : POSIX_AND_URL_PATHS_MATCH ) | (isDirectory ? IS_DIRECTORY : 0) | IS_DECOMPOSABLE | HAS_PATH | ORIGINAL_AND_URL_STRINGS_MATCH; - url->_ranges = (CFRange *)CFAllocatorAllocate(alloc, sizeof(CFRange), 0); - *(url->_ranges) = CFRangeMake(0, CFStringGetLength(url->_string)); - } - if ( releaseBaseURL && baseURL ) { - CFRelease(baseURL); + CFRelease(urlString); + result = true; } - CFRelease(urlString); - result = true; - } #elif DEPLOYMENT_TARGET_WINDOWS - CFStringRef filePath = CFStringCreateWithBytes(alloc, buffer, bufLen, CFStringFileSystemEncoding(), false); - if ( filePath ) { - result = _CFURLInitWithFileSystemPath(uninitializedURL, filePath, kCFURLWindowsPathStyle, isDirectory, baseURL); - CFRelease(filePath); - } + CFStringRef filePath = CFStringCreateWithBytes(alloc, buffer, bufLen, CFStringFileSystemEncoding(), false); + if ( filePath ) { + result = _CFURLInitWithFileSystemPath(uninitializedURL, filePath, kCFURLWindowsPathStyle, isDirectory, baseURL); + CFRelease(filePath); + } #endif + } #if DEBUG_URL_INITIALIZER_LOGGING CFLog(kCFLogLevelError, CFSTR("_CFURLInitWithFileSystemRepresentation (in) buffer '%*s', isDirectory %@, baseURL %@\n\t_CFURLInitWithFileSystemRepresentation (out) result %@, url %@"), input_bufLen, input_buffer, input_isDirectory ? CFSTR("YES") : CFSTR("NO"), input_baseURL, result ? CFSTR("YES") : CFSTR("NO"), uninitializedURL); if ( input_baseURL ) { diff --git a/CFURL.h b/CFURL.h index 406ce5c..ad91941 100644 --- a/CFURL.h +++ b/CFURL.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFURL.inc.h b/CFURL.inc.h index a41c7f1..93d73c5 100644 --- a/CFURL.inc.h +++ b/CFURL.inc.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFURLAccess.c b/CFURLAccess.c index 2da209b..91efeee 100644 --- a/CFURLAccess.c +++ b/CFURLAccess.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFURLAccess.h b/CFURLAccess.h index da2af3f..1d57379 100644 --- a/CFURLAccess.h +++ b/CFURLAccess.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFURLPriv.h b/CFURLPriv.h index 17d94e2..26ec2f2 100644 --- a/CFURLPriv.h +++ b/CFURLPriv.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFUUID.c b/CFUUID.c index 03c815d..68d9f46 100644 --- a/CFUUID.c +++ b/CFUUID.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFUUID.h b/CFUUID.h index b1f95f9..885873a 100644 --- a/CFUUID.h +++ b/CFUUID.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFUniChar.c b/CFUniChar.c index 56445c7..6693809 100644 --- a/CFUniChar.c +++ b/CFUniChar.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFUniChar.h b/CFUniChar.h index 2dc365f..7b95573 100644 --- a/CFUniChar.h +++ b/CFUniChar.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFUniCharPriv.h b/CFUniCharPriv.h index 205fa52..b285a15 100644 --- a/CFUniCharPriv.h +++ b/CFUniCharPriv.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFUniCharPropertyDatabase.data b/CFUniCharPropertyDatabase.data index 31ac3de..2cc8e6e 100644 Binary files a/CFUniCharPropertyDatabase.data and b/CFUniCharPropertyDatabase.data differ diff --git a/CFUnicodeData-B.mapping b/CFUnicodeData-B.mapping index 4b4b6d1..c2df15e 100644 Binary files a/CFUnicodeData-B.mapping and b/CFUnicodeData-B.mapping differ diff --git a/CFUnicodeData-L.mapping b/CFUnicodeData-L.mapping index 03d92b8..f92c352 100644 Binary files a/CFUnicodeData-L.mapping and b/CFUnicodeData-L.mapping differ diff --git a/CFUnicodeDecomposition.c b/CFUnicodeDecomposition.c index f760704..5aced29 100644 --- a/CFUnicodeDecomposition.c +++ b/CFUnicodeDecomposition.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFUnicodeDecomposition.h b/CFUnicodeDecomposition.h index 36a8add..df6f7b2 100644 --- a/CFUnicodeDecomposition.h +++ b/CFUnicodeDecomposition.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFUnicodePrecomposition.c b/CFUnicodePrecomposition.c index b66532e..0e294c4 100644 --- a/CFUnicodePrecomposition.c +++ b/CFUnicodePrecomposition.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFUnicodePrecomposition.h b/CFUnicodePrecomposition.h index 5f01591..6962711 100644 --- a/CFUnicodePrecomposition.h +++ b/CFUnicodePrecomposition.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFUserNotification.c b/CFUserNotification.c index 805bcb8..5cf3995 100644 --- a/CFUserNotification.c +++ b/CFUserNotification.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFUserNotification.h b/CFUserNotification.h index 6699c3a..ae1a2d0 100644 --- a/CFUserNotification.h +++ b/CFUserNotification.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFUtilities.c b/CFUtilities.c index d3877b3..cedf97f 100644 --- a/CFUtilities.c +++ b/CFUtilities.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFUtilities.h b/CFUtilities.h index e2080fd..aac9687 100644 --- a/CFUtilities.h +++ b/CFUtilities.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFVersion.c b/CFVersion.c index 7b72dbc..e118b14 100644 --- a/CFVersion.c +++ b/CFVersion.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * @@ -25,5 +25,5 @@ Copyright 2009-2011, Apple Inc. All rights reserved. Responsibility: CFLite Team */ -const unsigned char kCFCoreFoundationVersionString[] = "@(#)PROGRAM:CoreFoundation PROJECT:CoreFoundation-855.11 SYSTEM:Darwin DEVELOPER:unknown BUILT:" __DATE__ " " __TIME__ "\n"; -double kCFCoreFoundationVersionNumber = (double)855.11; +const unsigned char kCFCoreFoundationVersionString[] = "@(#)PROGRAM:CoreFoundation PROJECT:CoreFoundation-855.14 SYSTEM:Darwin DEVELOPER:unknown BUILT:" __DATE__ " " __TIME__ "\n"; +double kCFCoreFoundationVersionNumber = (double)855.14; diff --git a/CFWindowsUtilities.c b/CFWindowsUtilities.c index 6fcd046..2996b71 100644 --- a/CFWindowsUtilities.c +++ b/CFWindowsUtilities.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFXMLInputStream.c b/CFXMLInputStream.c index 52cc6c5..7a737dc 100644 --- a/CFXMLInputStream.c +++ b/CFXMLInputStream.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFXMLInputStream.h b/CFXMLInputStream.h index 9fb4532..b17d6d1 100644 --- a/CFXMLInputStream.h +++ b/CFXMLInputStream.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFXMLNode.c b/CFXMLNode.c index 84653d2..e71981c 100644 --- a/CFXMLNode.c +++ b/CFXMLNode.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFXMLNode.h b/CFXMLNode.h index 1717172..3f3db7d 100644 --- a/CFXMLNode.h +++ b/CFXMLNode.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFXMLParser.c b/CFXMLParser.c index 108f59e..f4635ca 100644 --- a/CFXMLParser.c +++ b/CFXMLParser.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFXMLParser.h b/CFXMLParser.h index f151434..b77f978 100644 --- a/CFXMLParser.h +++ b/CFXMLParser.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFXMLPreferencesDomain.c b/CFXMLPreferencesDomain.c index a87cbbe..80bacb7 100644 --- a/CFXMLPreferencesDomain.c +++ b/CFXMLPreferencesDomain.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CFXMLTree.c b/CFXMLTree.c index 9af9cc9..127f09d 100644 --- a/CFXMLTree.c +++ b/CFXMLTree.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CoreFoundation.h b/CoreFoundation.h index ead85b0..f20a355 100644 --- a/CoreFoundation.h +++ b/CoreFoundation.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/CoreFoundation_Prefix.h b/CoreFoundation_Prefix.h index e40a7f3..0fad0bd 100644 --- a/CoreFoundation_Prefix.h +++ b/CoreFoundation_Prefix.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/ForFoundationOnly.h b/ForFoundationOnly.h index 14711b0..0ffe6d0 100644 --- a/ForFoundationOnly.h +++ b/ForFoundationOnly.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ * diff --git a/MakefileVersion b/MakefileVersion index 5e02d2e..440f667 100644 --- a/MakefileVersion +++ b/MakefileVersion @@ -1 +1 @@ -VERSION=855.11 +VERSION=855.15 diff --git a/plconvert.c b/plconvert.c index 480e63b..2361478 100644 --- a/plconvert.c +++ b/plconvert.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Apple Inc. All rights reserved. + * Copyright (c) 2014 Apple Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ *