[git commit master] libbb: fix bb_ask() to operate on correct fd

Denys Vlasenko vda.linux at googlemail.com
Wed Feb 3 11:17:06 UTC 2010


commit: http://git.busybox.net/busybox/commit/?id=557deb1014c1c30a38bb7a7876a0dbc919b8ddad
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 libbb/bb_askpass.c |    5 ++---
 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;
-- 
1.6.3.3



More information about the busybox-cvs mailing list