aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncaen <mail@duncano.de>2017-05-19 19:04:00 +0200
committerDuncaen <mail@duncano.de>2017-05-19 19:04:00 +0200
commit0b5d491d27604eb65cc92f64c1169bad9a0761e1 (patch)
tree434263ad646342a9820f5b15b746e9ac716a0b9e
parentda751425eefe96744932e61e9372714b7d8b402b (diff)
downloadlobase-0b5d491d27604eb65cc92f64c1169bad9a0761e1.tar.gz
usr.bin/bc: update to OPENBSD_6_1
-rw-r--r--usr.bin/bc/bc.y7
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/bc/bc.y b/usr.bin/bc/bc.y
index 263bde8..c1f1c32 100644
--- a/usr.bin/bc/bc.y
+++ b/usr.bin/bc/bc.y
@@ -1,5 +1,5 @@
%{
-/* $OpenBSD: bc.y,v 1.49 2015/11/23 09:58:55 otto Exp $ */
+/* $OpenBSD: bc.y,v 1.50 2017/02/23 06:41:46 otto Exp $ */
/*
* Copyright (c) 2003, Otto Moerbeek <otto@drijf.net>
@@ -975,7 +975,7 @@ yyerror(char *s)
putchar('\\');
putchar(*p);
}
- fputs("]pc\n", stdout);
+ fputs("]ec\n", stdout);
free(str);
}
@@ -1141,7 +1141,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];