Detect EOF when reading stdio from terminal on Mac OS

runtime/bin/socket_patch.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 patch class RawServerSocket  {
   /* patch */ static Future<RawServerSocket> bind(address,
                                                   int port,
                                                   {int backlog: 0,
                                                    bool v6Only: false}) {
     return _RawServerSocket.bind(address, port, backlog, v6Only);
@@ skipping 697 matching lines @@
 }
 
 
 class _RawSocket extends Stream<RawSocketEvent>
                  implements RawSocket {
   final _NativeSocket _socket;
   StreamController<RawSocketEvent> _controller;
   bool _readEventsEnabled = true;
   bool _writeEventsEnabled = true;
 
+  // Flag to handle Ctrl-D closing of stdio on Mac OS.
+  bool _isMacOSTerminalInput = false;
+
   static Future<RawSocket> connect(host, int port) {
     return _NativeSocket.connect(host, port)
         .then((socket) => new _RawSocket(socket));
   }
 
   _RawSocket(this._socket) {
     _controller = new StreamController(sync: true,
         onListen: _onSubscriptionStateChange,
         onCancel: _onSubscriptionStateChange,
         onPause: _onPauseStateChange,
@@ skipping 19 matching lines @@
     var native = new _NativeSocket.pipe();
     native.isClosedRead = true;
     if (fd != null) _getStdioHandle(native, fd);
     return new _RawSocket(native);
   }
 
   factory _RawSocket._readPipe(int fd) {
     var native = new _NativeSocket.pipe();
     native.isClosedWrite = true;
     if (fd != null) _getStdioHandle(native, fd);
-    return new _RawSocket(native);
+    var result = new _RawSocket(native);
+    result._isMacOSTerminalInput =
+        Platform.isMacOS &&
+        _StdIOUtils._socketType(result) == _STDIO_HANDLE_TYPE_TERMINAL;
+    return result;
   }
 
   StreamSubscription<RawSocketEvent> listen(void onData(RawSocketEvent event),
                                             {void onError(Object error),
                                              void onDone(),
                                              bool cancelOnError}) {
     return _controller.stream.listen(
         onData,
         onError: onError,
         onDone: onDone,
         cancelOnError: cancelOnError);
   }
 
   int available() => _socket.available();
 
-  List<int> read([int len]) => _socket.read(len);
+  List<int> read([int len]) {
+    if (_isMacOSTerminalInput) {
+      var available = available();
+      if (available == 0) return null;
+      var data = _socket.read(len);
+      if (data == null || data.length < available) {
+        // Reading less than available from a Mac OS terminal indicate Ctrl-D.
+        // This is interpreted as read closed.
+        runAsync(() => _controller.add(RawSocketEvent.READ_CLOSED));
+      }
+      return data;
+    } else {
+      return _socket.read(len);
+    }
+  }
 
   int write(List<int> buffer, [int offset, int count]) =>
       _socket.write(buffer, offset, count);
 
   void close() => _socket.close();
 
   void shutdown(SocketDirection direction) => _socket.shutdown(direction);
 
   int get port => _socket.port;
 
@@ skipping 372 matching lines @@
     if (_detachReady != null) {
       _detachReady.complete(null);
     } else {
       if (_raw != null) {
         _raw.shutdown(SocketDirection.SEND);
         _disableWriteEvent();
       }
     }
   }
 }