summaryrefslogtreecommitdiff
path: root/openbsd-compat/readpassphrase.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2005-05-24 15:54:27 +1000
committerDamien Miller <djm@mindrot.org>2005-05-24 15:54:27 +1000
commitdf548bc31062fcc7f5ab618821ab4653b170ec60 (patch)
tree7bc5817f762593d0134df894dc2b2354c38b138e /openbsd-compat/readpassphrase.c
parentb58bd0327ea9282be941db786ff191bea033eec1 (diff)
- (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@
Diffstat (limited to 'openbsd-compat/readpassphrase.c')
-rw-r--r--openbsd-compat/readpassphrase.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/openbsd-compat/readpassphrase.c b/openbsd-compat/readpassphrase.c
index 4ee1be5de..b5f4d1ce4 100644
--- a/openbsd-compat/readpassphrase.c
+++ b/openbsd-compat/readpassphrase.c
@@ -138,7 +138,9 @@ restart:
138 138
139 /* Restore old terminal settings and signals. */ 139 /* Restore old terminal settings and signals. */
140 if (memcmp(&term, &oterm, sizeof(term)) != 0) 140 if (memcmp(&term, &oterm, sizeof(term)) != 0)
141 (void)tcsetattr(input, _T_FLUSH, &oterm); 141 for (;tcsetattr(input, _T_FLUSH, &oterm) == -1 &&
142 errno == EINTR;)
143 ;
142 (void)sigaction(SIGALRM, &savealrm, NULL); 144 (void)sigaction(SIGALRM, &savealrm, NULL);
143 (void)sigaction(SIGHUP, &savehup, NULL); 145 (void)sigaction(SIGHUP, &savehup, NULL);
144 (void)sigaction(SIGINT, &saveint, NULL); 146 (void)sigaction(SIGINT, &saveint, NULL);