From ff1d651415a2752e82ec417294f9bdf8c234c10f Mon Sep 17 00:00:00 2001 From: Kurtis Rader Date: Sat, 14 May 2016 20:35:54 -0700 Subject: rename get_is_interactive and remove stupid test I'm doing this as part of fixing issue #2980. The code for managing tty modes and job control is a horrible mess. This is a very tiny step towards improving the situation. --- src/builtin.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/builtin.cpp') diff --git a/src/builtin.cpp b/src/builtin.cpp index db528aa0..e5261cb4 100644 --- a/src/builtin.cpp +++ b/src/builtin.cpp @@ -181,7 +181,7 @@ void builtin_print_help(parser_t &parser, io_streams_t &streams, const wchar_t * screen_height = common_get_height(); lines = count_char(str, L'\n'); - if (!get_is_interactive() || (lines > 2 * screen_height / 3)) { + if (!shell_is_interactive() || (lines > 2 * screen_height / 3)) { wchar_t *pos; int cut = 0; int i; @@ -2368,7 +2368,7 @@ static int builtin_cd(parser_t &parser, io_streams_t &streams, wchar_t **argv) { argv[0], dir_in.c_str()); } - if (!get_is_interactive()) { + if (!shell_is_interactive()) { streams.err.append(parser.current_line()); } @@ -2385,7 +2385,7 @@ static int builtin_cd(parser_t &parser, io_streams_t &streams, wchar_t **argv) { streams.err.append_format(_(L"%ls: '%ls' is not a directory\n"), argv[0], dir.c_str()); } - if (!get_is_interactive()) { + if (!shell_is_interactive()) { streams.err.append(parser.current_line()); } -- cgit v1.2.3