diff options
Diffstat (limited to 'lib/commands/toolcontext.c')
| -rw-r--r-- | lib/commands/toolcontext.c | 54 |
1 files changed, 31 insertions, 23 deletions
diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c index 0ede1040..9c2404f4 100644 --- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c @@ -1326,21 +1326,25 @@ struct cmd_context *create_toolcontext(unsigned is_long_lived, goto out; } - if (!_reopen_stream(stdin, STDIN_FILENO, "r", "stdin", &new_stream)) - goto_out; - stdin = new_stream; - if (setvbuf(stdin, cmd->linebuffer, _IOLBF, linebuffer_size)) { - log_sys_error("setvbuf", ""); - goto out; + if (is_valid_fd(STDIN_FILENO)) { + if (!_reopen_stream(stdin, STDIN_FILENO, "r", "stdin", &new_stream)) + goto_out; + stdin = new_stream; + if (setvbuf(stdin, cmd->linebuffer, _IOLBF, linebuffer_size)) { + log_sys_error("setvbuf", ""); + goto out; + } } - if (!_reopen_stream(stdout, STDOUT_FILENO, "w", "stdout", &new_stream)) - goto_out; - stdout = new_stream; - if (setvbuf(stdout, cmd->linebuffer + linebuffer_size, - _IOLBF, linebuffer_size)) { - log_sys_error("setvbuf", ""); - goto out; + if (is_valid_fd(STDOUT_FILENO)) { + if (!_reopen_stream(stdout, STDOUT_FILENO, "w", "stdout", &new_stream)) + goto_out; + stdout = new_stream; + if (setvbuf(stdout, cmd->linebuffer + linebuffer_size, + _IOLBF, linebuffer_size)) { + log_sys_error("setvbuf", ""); + goto out; + } } /* Buffers are used for lines without '\n' */ } else @@ -1614,17 +1618,21 @@ void destroy_toolcontext(struct cmd_context *cmd) if (cmd->linebuffer) { /* Reset stream buffering to defaults */ - if (_reopen_stream(stdin, STDIN_FILENO, "r", "stdin", &new_stream)) { - stdin = new_stream; - setlinebuf(stdin); - } else - cmd->linebuffer = NULL; /* Leave buffer in place (deliberate leak) */ + if (is_valid_fd(STDIN_FILENO)) { + if (_reopen_stream(stdin, STDIN_FILENO, "r", "stdin", &new_stream)) { + stdin = new_stream; + setlinebuf(stdin); + } else + cmd->linebuffer = NULL; /* Leave buffer in place (deliberate leak) */ + } - if (_reopen_stream(stdout, STDOUT_FILENO, "w", "stdout", &new_stream)) { - stdout = new_stream; - setlinebuf(stdout); - } else - cmd->linebuffer = NULL; /* Leave buffer in place (deliberate leak) */ + if (is_valid_fd(STDOUT_FILENO)) { + if (_reopen_stream(stdout, STDOUT_FILENO, "w", "stdout", &new_stream)) { + stdout = new_stream; + setlinebuf(stdout); + } else + cmd->linebuffer = NULL; /* Leave buffer in place (deliberate leak) */ + } dm_free(cmd->linebuffer); } |