aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYoshihiro Takahashi <nyan@FreeBSD.org>2019-01-12 12:35:02 +0000
committerYoshihiro Takahashi <nyan@FreeBSD.org>2019-01-12 12:35:02 +0000
commit1da80a2c7564f29ecfa0bafec753e559dd194e05 (patch)
treef9a5afd6cbace7c4e23d36eeefd9e756c7d3840a
parentc1bc2f7a022bbcdeec73baa2af9259dccec16e67 (diff)
downloadsrc-1da80a2c7564f29ecfa0bafec753e559dd194e05.tar.gz
src-1da80a2c7564f29ecfa0bafec753e559dd194e05.zip
Sync with OpenBSD.
bc.y: Rev 1.50 - write parse errors to stderr, prompted by Martijn Dekker - we're only interactive if stdout en stderr are a tty as well as stdin PR: 234430 Obtained from: OpenBSD MFC after: 1 week
Notes
Notes: svn path=/head/; revision=342964
-rw-r--r--usr.bin/bc/bc.y5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/bc/bc.y b/usr.bin/bc/bc.y
index 50ac130b461c..793ad46d7f53 100644
--- a/usr.bin/bc/bc.y
+++ b/usr.bin/bc/bc.y
@@ -996,7 +996,7 @@ yyerror(const char *s)
putchar('\\');
putchar(*p);
}
- fputs("]pc\n", stdout);
+ fputs("]ec\n", stdout);
free(str);
}
@@ -1173,7 +1173,8 @@ main(int argc, char *argv[])
argc -= optind;
argv += optind;
- interactive = isatty(STDIN_FILENO);
+ interactive = isatty(STDIN_FILENO) && isatty(STDOUT_FILENO) &&
+ isatty(STDERR_FILENO);
for (i = 0; i < argc; i++)
sargv[sargc++] = argv[i];