Merge pull request #1659 from compnerd/file-pipe

NSFileHandle/NSPipe compatibility

Author: compnerd

Foundation/FileHandle.swift

@@ -19,7 +19,14 @@ open class FileHandle : NSObject, NSSecureCoding {
     internal var _fd: Int32
     internal var _closeOnDealloc: Bool
     internal var _closed: Bool = false
-    
+
+    open var readabilityHandler: ((FileHandle) -> Void)? = {
+      (FileHandle) -> Void in NSUnimplemented()
+    }
+    open var writeabilityHandler: ((FileHandle) -> Void)? = {
+      (FileHandle) -> Void in NSUnimplemented()
+    }
+
     open var availableData: Data {
         return _readDataOfLength(Int.max, untilEOF: false)
     }
@@ -346,14 +353,6 @@ extension FileHandle {
     open func waitForDataInBackgroundAndNotify() {
         NSUnimplemented()
     }
-    
-    open var readabilityHandler: ((FileHandle) -> Void)? {
-        NSUnimplemented()
-    }
-
-    open var writeabilityHandler: ((FileHandle) -> Void)? {
-        NSUnimplemented()
-    }
 }
 
 extension FileHandle {
@@ -367,9 +366,9 @@ extension FileHandle {
 }
 
 open class Pipe: NSObject {
-    private let readHandle: FileHandle
-    private let writeHandle: FileHandle
-    
+    open let fileHandleForReading: FileHandle
+    open let fileHandleForWriting: FileHandle
+
     public override init() {
         /// the `pipe` system call creates two `fd` in a malloc'ed area
         var fds = UnsafeMutablePointer<Int32>.allocate(capacity: 2)
@@ -383,19 +382,11 @@ open class Pipe: NSObject {
         /// don't need to add a `deinit` to this class
 
         /// Create the read handle from the first fd in `fds`
-        self.readHandle = FileHandle(fileDescriptor: fds.pointee, closeOnDealloc: true)
+        self.fileHandleForReading = FileHandle(fileDescriptor: fds.pointee, closeOnDealloc: true)
 
         /// Advance `fds` by one to create the write handle from the second fd
-        self.writeHandle = FileHandle(fileDescriptor: fds.successor().pointee, closeOnDealloc: true)
+        self.fileHandleForWriting = FileHandle(fileDescriptor: fds.successor().pointee, closeOnDealloc: true)
 
         super.init()
     }
-    
-    open var fileHandleForReading: FileHandle {
-        return self.readHandle
-    }
-    
-    open var fileHandleForWriting: FileHandle {
-        return self.writeHandle
-    }
 }