Correct stream access points and fix #ifdefs gating open

Author: phausler

CoreFoundation/Base.subproj/ForSwiftFoundationOnly.h

@@ -304,6 +304,10 @@ CF_EXPORT CFMutableCharacterSetRef _CFCharacterSetCreateMutableCopy(CFAllocatorR
 
 CF_EXPORT CFReadStreamRef CFReadStreamCreateWithData(CFAllocatorRef alloc, CFDataRef data);
 
+CF_EXPORT _Nullable CFErrorRef _CFReadStreamCopyError(CFReadStreamRef stream);
+
+CF_EXPORT _Nullable CFErrorRef _CFWriteStreamCopyError(CFWriteStreamRef stream);
+
 _CF_EXPORT_SCOPE_END
 
 #endif /* __COREFOUNDATION_FORSWIFTFOUNDATIONONLY__ */

CoreFoundation/Stream.subproj/CFConcreteStreams.c

@@ -83,7 +83,7 @@ static Boolean constructFD(_CFFileStreamContext *fileStream, CFStreamError *erro
     wchar_t path[CFMaxPathSize];
     flags |= (_O_BINARY|_O_NOINHERIT);
     if (_CFURLGetWideFileSystemRepresentation(fileStream->url, TRUE, path, CFMaxPathSize) == FALSE)
-#elif DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI
+#else
     char path[CFMaxPathSize];
     if (CFURLGetFileSystemRepresentation(fileStream->url, TRUE, (UInt8 *)path, CFMaxPathSize) == FALSE)
 #endif
@@ -98,10 +98,10 @@ static Boolean constructFD(_CFFileStreamContext *fileStream, CFStreamError *erro
     }
 
     do {
-#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI
+#if DEPLOYMENT_TARGET_WINDOWS
+        fileStream->fd = _wopen(path, flags, 0666);
+#else
         fileStream->fd = open((const char *)path, flags, 0666);
-#elif DEPLOYMENT_TARGET_WINDOWS
-	fileStream->fd = _wopen(path, flags, 0666);
 #endif
         if (fileStream->fd < 0)
             break;
@@ -865,5 +865,10 @@ CF_EXPORT CFWriteStreamRef CFWriteStreamCreateWithAllocatedBuffers(CFAllocatorRe
     return (CFWriteStreamRef)_CFStreamCreateWithConstantCallbacks(alloc, &ctxt, (struct _CFStreamCallBacks *)(&writeDataCallBacks), FALSE);
 }
 
+CF_SWIFT_EXPORT _Nullable CFErrorRef _CFReadStreamCopyError(CFReadStreamRef stream) { return CFReadStreamCopyError(stream); }
+
+CF_SWIFT_EXPORT _Nullable CFErrorRef _CFWriteStreamCopyError(CFWriteStreamRef stream) { return CFWriteStreamCopyError(stream); }
+
+
 #undef BUF_SIZE
 

Foundation/NSStream.swift

@@ -111,7 +111,7 @@ open class Stream: NSObject {
     }
 
     open var streamError: NSError? {
-        NSUnimplemented()
+        NSRequiresConcreteImplementation()
     }
 }
 
@@ -159,6 +159,10 @@ open class InputStream: Stream {
     open override var streamStatus: Status {
         return Stream.Status(rawValue: UInt(CFReadStreamGetStatus(_stream)))!
     }
+    
+    open override var streamError: NSError? {
+        return _CFReadStreamCopyError(_stream)?._nsObject
+    }
 }
 
 // OutputStream is an abstract class representing the base functionality of a write stream.
@@ -219,6 +223,10 @@ open class OutputStream : Stream {
     open  override func setProperty(_ property: AnyObject?, forKey key: PropertyKey) -> Bool {
         return CFWriteStreamSetProperty(_stream, key.rawValue._cfObject, property)
     }
+    
+    open override var streamError: NSError? {
+        return _CFWriteStreamCopyError(_stream)?._nsObject
+    }
 }
 
 // Discussion of this API is ongoing for its usage of AutoreleasingUnsafeMutablePointer