From df548bc31062fcc7f5ab618821ab4653b170ec60 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 24 May 2005 15:54:27 +1000 Subject: - (djm) [openbsd-compat/readpassphrase.c] bz #950: Retry tcsetattr to ensure terminal modes are reset correctly. Fix from peak AT argo.troja.mff.cuni.cz; "looks ok" dtucker@ --- ChangeLog | 7 ++++++- openbsd-compat/readpassphrase.c | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ecf83e4d..0978c43e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +20050512 + - (djm) [openbsd-compat/readpassphrase.c] bz #950: Retry tcsetattr to ensure + terminal modes are reset correctly. Fix from peak AT argo.troja.mff.cuni.cz; + "looks ok" dtucker@ + 20050512 - (tim) [buildpkg.sh.in] missing ${PKG_INSTALL_ROOT} in init script hard link section. Bug 1038. @@ -2482,4 +2487,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3755 2005/05/12 17:32:19 tim Exp $ +$Id: ChangeLog,v 1.3756 2005/05/24 05:54:27 djm Exp $ diff --git a/openbsd-compat/readpassphrase.c b/openbsd-compat/readpassphrase.c index 4ee1be5d..b5f4d1ce 100644 --- a/openbsd-compat/readpassphrase.c +++ b/openbsd-compat/readpassphrase.c @@ -138,7 +138,9 @@ restart: /* Restore old terminal settings and signals. */ if (memcmp(&term, &oterm, sizeof(term)) != 0) - (void)tcsetattr(input, _T_FLUSH, &oterm); + for (;tcsetattr(input, _T_FLUSH, &oterm) == -1 && + errno == EINTR;) + ; (void)sigaction(SIGALRM, &savealrm, NULL); (void)sigaction(SIGHUP, &savehup, NULL); (void)sigaction(SIGINT, &saveint, NULL); -- cgit v1.2.3