diff options
| -rw-r--r-- | console-tools/setlogcons.c | 2 | ||||
| -rw-r--r-- | findutils/xargs.c | 4 | ||||
| -rw-r--r-- | miscutils/rx.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/console-tools/setlogcons.c b/console-tools/setlogcons.c index 1f0ac524e..32153bd2c 100644 --- a/console-tools/setlogcons.c +++ b/console-tools/setlogcons.c @@ -27,7 +27,7 @@ extern int setlogcons_main(int argc, char **argv) if (argc == 2) arg.subarg = atoi(argv[1]); - if (ioctl(bb_xopen("/dev/tty1", O_RDONLY), TIOCLINUX, &arg)) + if (ioctl(bb_xopen(VC_1, O_RDONLY), TIOCLINUX, &arg)) bb_perror_msg_and_die("TIOCLINUX");; return 0; diff --git a/findutils/xargs.c b/findutils/xargs.c index 5a5e1c64c..ec6d99cac 100644 --- a/findutils/xargs.c +++ b/findutils/xargs.c @@ -311,9 +311,7 @@ static int xargs_ask_confirmation(void) int c, savec; if (!tty_stream) { - tty_stream = fopen("/dev/tty", "r"); - if (!tty_stream) - bb_perror_msg_and_die("/dev/tty"); + tty_stream = bb_xfopen(CURRENT_TTY, "r"); /* pranoidal security by vodz */ fcntl(fileno(tty_stream), F_SETFD, FD_CLOEXEC); } diff --git a/miscutils/rx.c b/miscutils/rx.c index ef372d383..5fa98b5ef 100644 --- a/miscutils/rx.c +++ b/miscutils/rx.c @@ -290,7 +290,7 @@ int rx_main(int argc, char **argv) bb_show_usage(); fn = argv[1]; - ttyfd = bb_xopen3("/dev/tty", O_RDWR, 0); + ttyfd = bb_xopen3(CURRENT_TTY, O_RDWR, 0); filefd = bb_xopen3(fn, O_RDWR|O_CREAT|O_TRUNC, 0666); if (tcgetattr(ttyfd, &tty) < 0) |