| OLD | NEW |
| 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 class _SocketInputStream implements SocketInputStream { | 5 class _SocketInputStream implements SocketInputStream { |
| 6 _SocketInputStream(Socket socket) : _socket = socket { | 6 _SocketInputStream(Socket socket) : _socket = socket { |
| 7 _socket.closeHandler = _closeHandler; | 7 _socket.closeHandler = _closeHandler; |
| 8 } | 8 } |
| 9 | 9 |
| 10 List<int> read([int len]) { | 10 List<int> read([int len]) { |
| 11 int bytesToRead = available(); | 11 int bytesToRead = available(); |
| 12 if (bytesToRead == 0) return null; | 12 if (bytesToRead == 0) return null; |
| 13 if (len !== null) { | 13 if (len !== null) { |
| 14 if (len <= 0) { | 14 if (len <= 0) { |
| 15 throw new StreamException("Illegal length $len"); | 15 throw new StreamException("Illegal length $len"); |
| 16 } else if (bytesToRead > len) { | 16 } else if (bytesToRead > len) { |
| 17 bytesToRead = len; | 17 bytesToRead = len; |
| 18 } | 18 } |
| 19 } | 19 } |
| 20 ByteArray buffer = new ByteArray(bytesToRead); | 20 ByteArray buffer = new ByteArray(bytesToRead); |
| 21 int bytesRead = _socket.readList(buffer, 0, bytesToRead); | 21 int bytesRead = _socket.readList(buffer, 0, bytesToRead); |
| 22 if (bytesRead < bytesToRead) { | 22 if (bytesRead == 0) { |
| 23 // On MacOS when reading from a tty Ctrl-D will result in one |
| 24 // byte reported as available. Attempting to read it out will |
| 25 // result in zero bytes read. When that happens there is no data |
| 26 // which is indicated by a null return value. |
| 27 return null; |
| 28 } else if (bytesRead < bytesToRead) { |
| 23 ByteArray newBuffer = new ByteArray(bytesRead); | 29 ByteArray newBuffer = new ByteArray(bytesRead); |
| 24 newBuffer.setRange(0, bytesRead, buffer); | 30 newBuffer.setRange(0, bytesRead, buffer); |
| 25 return newBuffer; | 31 return newBuffer; |
| 26 } else { | 32 } else { |
| 27 return buffer; | 33 return buffer; |
| 28 } | 34 } |
| 29 } | 35 } |
| 30 | 36 |
| 31 int readInto(List<int> buffer, int offset, int len) { | 37 int readInto(List<int> buffer, int offset, int len) { |
| 32 if (offset === null) offset = 0; | 38 if (offset === null) offset = 0; |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 180 if (_streamErrorHandler != null) _streamErrorHandler(); | 186 if (_streamErrorHandler != null) _streamErrorHandler(); |
| 181 } | 187 } |
| 182 | 188 |
| 183 Socket _socket; | 189 Socket _socket; |
| 184 _BufferList _pendingWrites; | 190 _BufferList _pendingWrites; |
| 185 var _noPendingWriteHandler; | 191 var _noPendingWriteHandler; |
| 186 var _streamErrorHandler; | 192 var _streamErrorHandler; |
| 187 bool _closing = false; | 193 bool _closing = false; |
| 188 bool _closed = false; | 194 bool _closed = false; |
| 189 } | 195 } |
| OLD | NEW |