nicer fix from millert@

1 files changed, 5 insertions, 4 deletions

diff --git a/openbsd-compat/readpassphrase.c b/openbsd-compat/readpassphrase.c
index b5f4d1ce4..5138b4034 100644
--- a/openbsd-compat/readpassphrase.c
+++ b/openbsd-compat/readpassphrase.c
@@ -137,10 +137,11 @@ restart:
                 (void)write(output, "\n", 1);
 
         /* Restore old terminal settings and signals. */
-        if (memcmp(&term, &oterm, sizeof(term)) != 0)
-                for (;tcsetattr(input, _T_FLUSH, &oterm) == -1 &&
-                    errno == EINTR;)
-                        ;
+        if (memcmp(&term, &oterm, sizeof(term)) != 0) {
+                while (tcsetattr(input, TCSANOW|TCSASOFT, &oterm) == -1 &&
+                    errno == EINTR)
+                        continue;
+        }
         (void)sigaction(SIGALRM, &savealrm, NULL);
         (void)sigaction(SIGHUP, &savehup, NULL);
         (void)sigaction(SIGINT, &saveint, NULL);