summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-02-03 11:17:06 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2010-02-03 11:17:06 (GMT)
commit557deb1014c1c30a38bb7a7876a0dbc919b8ddad (patch)
treea4c2cc98cf53967f32be9e3d2c363f41976a7ea0
parent659507f84e0e25eb0f3d6bfa9a9d807c89fc251e (diff)
downloadbusybox-557deb1014c1c30a38bb7a7876a0dbc919b8ddad.tar.gz
busybox-557deb1014c1c30a38bb7a7876a0dbc919b8ddad.tar.bz2
libbb: fix bb_ask() to operate on correct fd
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--libbb/bb_askpass.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libbb/bb_askpass.c b/libbb/bb_askpass.c
index bf45780..12ebe17 100644
--- a/libbb/bb_askpass.c
+++ b/libbb/bb_askpass.c
@@ -38,7 +38,7 @@ char* FAST_FUNC bb_ask(const int fd, int timeout, const char *prompt)
#endif
tio.c_iflag &= ~(IUCLC|IXON|IXOFF|IXANY);
tio.c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|TOSTOP);
- tcsetattr_stdin_TCSANOW(&tio);
+ tcsetattr(fd, TCSANOW, &tio);
memset(&sa, 0, sizeof(sa));
/* sa.sa_flags = 0; - no SA_RESTART! */
@@ -77,8 +77,7 @@ char* FAST_FUNC bb_ask(const int fd, int timeout, const char *prompt)
alarm(0);
}
sigaction_set(SIGINT, &oldsa);
-
- tcsetattr_stdin_TCSANOW(&oldtio);
+ tcsetattr(fd, TCSANOW, &oldtio);
bb_putchar('\n');
fflush_all();
return ret;