From 7074cadf9982bde670211f02f537e26e1964eb81 Mon Sep 17 00:00:00 2001 From: SquidDev Date: Sun, 28 Oct 2018 08:39:12 +0000 Subject: [PATCH] Fix a couple of other bugs with the fs rewrite - Fix stdin not being considered a "readable" input - Return an unsigned byte rather than a signed one for no-args .read() --- .../computercraft/core/apis/handles/BinaryReadableHandle.java | 2 +- src/main/resources/assets/computercraft/lua/rom/apis/io.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/dan200/computercraft/core/apis/handles/BinaryReadableHandle.java b/src/main/java/dan200/computercraft/core/apis/handles/BinaryReadableHandle.java index 91934f086f..d9078ab000 100644 --- a/src/main/java/dan200/computercraft/core/apis/handles/BinaryReadableHandle.java +++ b/src/main/java/dan200/computercraft/core/apis/handles/BinaryReadableHandle.java @@ -118,7 +118,7 @@ else if( count == 0 && m_seekable != null ) { single.clear(); int b = m_reader.read( single ); - return b == -1 ? null : new Object[] { single.get( 0 ) }; + return b == -1 ? null : new Object[] { single.get( 0 ) & 0xFF }; } } catch( IOException e ) diff --git a/src/main/resources/assets/computercraft/lua/rom/apis/io.lua b/src/main/resources/assets/computercraft/lua/rom/apis/io.lua index c7890f12fd..73e50da08b 100644 --- a/src/main/resources/assets/computercraft/lua/rom/apis/io.lua +++ b/src/main/resources/assets/computercraft/lua/rom/apis/io.lua @@ -63,7 +63,7 @@ handleMetatable = { if self._closed then error("attempt to use a closed file", 2) end local handle = self._handle - if not handle.read then return nil, "Not opened for reading" end + if not handle.read and not handle.readLine then return nil, "Not opened for reading" end local n = select('#', ...) local output = {}