diff options
| author | bptato <nincsnevem662@gmail.com> | 2025-01-09 20:04:31 +0100 |
|---|---|---|
| committer | bptato <nincsnevem662@gmail.com> | 2025-01-09 20:04:31 +0100 |
| commit | bbb6c7ded9bdd0c2983ba33b3fd8113f04d0cdb5 (patch) | |
| tree | c0f014f252b7cad33ff7867200e697d98dc7fb44 /src/io | |
| parent | 36c280848e85595166e51bacb215a4d1eb550e0d (diff) | |
| download | chawan-bbb6c7ded9bdd0c2983ba33b3fd8113f04d0cdb5.tar.gz | |
bufstream: allow 0-width packets
Diffstat (limited to 'src/io')
| -rw-r--r-- | src/io/bufreader.nim | 2 | ||||
| -rw-r--r-- | src/io/dynstream.nim | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/io/bufreader.nim b/src/io/bufreader.nim index 50341bbc..a13583b3 100644 --- a/src/io/bufreader.nim +++ b/src/io/bufreader.nim @@ -27,7 +27,7 @@ proc sread*(reader: var BufferedReader; c: var ARGBColor) proc sread*(reader: var BufferedReader; c: var CellColor) proc initReader*(stream: DynStream; len, auxLen: int): BufferedReader = - assert len != 0 + assert len != 0 or auxLen != 0 var reader = BufferedReader( buffer: newSeqUninitialized[uint8](len), bufIdx: 0 diff --git a/src/io/dynstream.nim b/src/io/dynstream.nim index 668bbc32..963525f2 100644 --- a/src/io/dynstream.nim +++ b/src/io/dynstream.nim @@ -67,16 +67,16 @@ proc sreadChar*(s: DynStream): char = proc recvDataLoop*(s: DynStream; buffer: pointer; len: int) = var n = 0 - while true: + while n < len: n += s.recvData(addr cast[ptr UncheckedArray[uint8]](buffer)[n], len - n) - if n == len: - break proc recvDataLoop*(s: DynStream; buffer: var openArray[uint8]) {.inline.} = - s.recvDataLoop(addr buffer[0], buffer.len) + if buffer.len > 0: + s.recvDataLoop(addr buffer[0], buffer.len) proc recvDataLoop*(s: DynStream; buffer: var openArray[char]) {.inline.} = - s.recvDataLoop(addr buffer[0], buffer.len) + if buffer.len > 0: + s.recvDataLoop(addr buffer[0], buffer.len) proc recvAll*(s: DynStream): string = var buffer = newString(4096) |