Git-Mirrors/rnsh
1
0
Fork 0
mirror of https://github.com/markqvist/rnsh.git synced 2025-01-07 05:07:57 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix issue with invalid fds sometimes

Browse Source
This commit is contained in:
Aaron Heise 2023-02-10 21:39:05 -06:00
parent 761ffeb45a
commit caf33a1f5d
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rnsh/process.py
View File

@ -110,6 +110,8 @@ def tty_set_winsize(fd: int, rows: int, cols: int, h_pixels: int, v_pixels: int)
:param h_pixels: number of visible horizontal pixels :param h_pixels: number of visible horizontal pixels
:param v_pixels: number of visible vertical pixels :param v_pixels: number of visible vertical pixels
""" """
if fd < 0:
return
packed = struct.pack('HHHH', rows, cols, h_pixels, v_pixels) packed = struct.pack('HHHH', rows, cols, h_pixels, v_pixels)
fcntl.ioctl(fd, termios.TIOCSWINSZ, packed) fcntl.ioctl(fd, termios.TIOCSWINSZ, packed)
@ -182,7 +184,7 @@ class CallbackSubprocess:
self._log = module_logger.getChild(self.__class__.__name__) self._log = module_logger.getChild(self.__class__.__name__)
# self._log.debug(f"__init__({argv},{term},...") # self._log.debug(f"__init__({argv},{term},...")
self._command: [str] = argv self._command: [str] = argv
self._env = env self._env = env or {}
self._loop = loop self._loop = loop
self._stdout_cb = stdout_callback self._stdout_cb = stdout_callback
self._terminated_cb = terminated_callback self._terminated_cb = terminated_callback
@ -383,7 +385,11 @@ async def main():
# log.debug(f"terminated {rc}") # log.debug(f"terminated {rc}")
retcode.set_result(rc) retcode.set_result(rc)
process = CallbackSubprocess(sys.argv[1:], os.environ.get("TERM", "xterm"), loop, stdout, terminated) process = CallbackSubprocess(argv=sys.argv[1:],
env={"TERM": os.environ.get("TERM", "xterm")},
loop=loop,
stdout_callback=stdout,
terminated_callback=terminated)
def sigint_handler(signal, frame): def sigint_handler(signal, frame):
# log.debug("KeyboardInterrupt") # log.debug("KeyboardInterrupt")