aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/builtin.cpp
diff options
context:
space:
mode:
authorGravatar Kurtis Rader <krader@skepticism.us>2016-05-14 20:35:54 -0700
committerGravatar Kurtis Rader <krader@skepticism.us>2016-05-14 20:35:54 -0700
commitff1d651415a2752e82ec417294f9bdf8c234c10f (patch)
treef9dce0f5ad2d8a9d160f4090887b34a34fdefcf4 /src/builtin.cpp
parent149e601743f2ad85df8a3bd0cc857bfd0387ef67 (diff)
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.
Diffstat (limited to 'src/builtin.cpp')
-rw-r--r--src/builtin.cpp6
1 files changed, 3 insertions, 3 deletions
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());
}