- (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@
This commit is contained in:
Damien Miller 2005-05-24 15:54:27 +10:00
parent b58bd0327e
commit df548bc310
2 changed files with 9 additions and 2 deletions

View File

@ -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 20050512
- (tim) [buildpkg.sh.in] missing ${PKG_INSTALL_ROOT} in init script - (tim) [buildpkg.sh.in] missing ${PKG_INSTALL_ROOT} in init script
hard link section. Bug 1038. hard link section. Bug 1038.
@ -2482,4 +2487,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (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 $

View File

@ -138,7 +138,9 @@ restart:
/* Restore old terminal settings and signals. */ /* Restore old terminal settings and signals. */
if (memcmp(&term, &oterm, sizeof(term)) != 0) 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(SIGALRM, &savealrm, NULL);
(void)sigaction(SIGHUP, &savehup, NULL); (void)sigaction(SIGHUP, &savehup, NULL);
(void)sigaction(SIGINT, &saveint, NULL); (void)sigaction(SIGINT, &saveint, NULL);