Import rev 1.23 from OpenBSD. Fixes bz#2619.

revision 1.23
date: 2010/05/14 13:30:34;  author: millert;  state: Exp;  lines: +41 -39;
Defer installing signal handlers until echo is disabled so that we
get suspended normally when not the foreground process.  Fix potential
infinite loop when restoring terminal settings if process is in the
background when restore occurs.  OK miod@

1 files changed, 43 insertions, 41 deletions

diff --git a/openbsd-compat/readpassphrase.c b/openbsd-compat/readpassphrase.c
index 81c4c2fa1..82a0b7239 100644
--- a/openbsd-compat/readpassphrase.c
+++ b/openbsd-compat/readpassphrase.c
@@ -1,7 +1,8 @@
-/*      $OpenBSD: readpassphrase.c,v 1.22 2010/01/13 10:20:54 dtucker Exp $     */
+/*      $OpenBSD: readpassphrase.c,v 1.23 2010/05/14 13:30:34 millert Exp $     */
 
 /*
- * Copyright (c) 2000-2002, 2007 Todd C. Miller <Todd.Miller@courtesan.com>
+ * Copyright (c) 2000-2002, 2007, 2010
+ *      Todd C. Miller <Todd.Miller@courtesan.com>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -94,24 +95,10 @@ restart:
         }
 
         /*
-         * Catch signals that would otherwise cause the user to end
-         * up with echo turned off in the shell.  Don't worry about
-         * things like SIGXCPU and SIGVTALRM for now.
+         * Turn off echo if possible.
+         * If we are using a tty but are not the foreground pgrp this will
+         * generate SIGTTOU, so do it *before* installing the signal handlers.
          */
-        sigemptyset(&sa.sa_mask);
-        sa.sa_flags = 0;                /* don't restart system calls */
-        sa.sa_handler = handler;
-        (void)sigaction(SIGALRM, &sa, &savealrm);
-        (void)sigaction(SIGHUP, &sa, &savehup);
-        (void)sigaction(SIGINT, &sa, &saveint);
-        (void)sigaction(SIGPIPE, &sa, &savepipe);
-        (void)sigaction(SIGQUIT, &sa, &savequit);
-        (void)sigaction(SIGTERM, &sa, &saveterm);
-        (void)sigaction(SIGTSTP, &sa, &savetstp);
-        (void)sigaction(SIGTTIN, &sa, &savettin);
-        (void)sigaction(SIGTTOU, &sa, &savettou);
-
-        /* Turn off echo if possible. */
         if (input != STDIN_FILENO && tcgetattr(input, &oterm) == 0) {
                 memcpy(&term, &oterm, sizeof(term));
                 if (!(flags & RPP_ECHO_ON))
@@ -128,35 +115,50 @@ restart:
                 oterm.c_lflag |= ECHO;
         }
 
-        /* No I/O if we are already backgrounded. */
-        if (signo[SIGTTOU] != 1 && signo[SIGTTIN] != 1) {
-                if (!(flags & RPP_STDIN))
-                        (void)write(output, prompt, strlen(prompt));
-                end = buf + bufsiz - 1;
-                p = buf;
-                while ((nr = read(input, &ch, 1)) == 1 && ch != '\n' && ch != '\r') {
-                        if (p < end) {
-                                if ((flags & RPP_SEVENBIT))
-                                        ch &= 0x7f;
-                                if (isalpha(ch)) {
-                                        if ((flags & RPP_FORCELOWER))
-                                                ch = (char)tolower(ch);
-                                        if ((flags & RPP_FORCEUPPER))
-                                                ch = (char)toupper(ch);
-                                }
-                                *p++ = ch;
+        /*
+         * Catch signals that would otherwise cause the user to end
+         * up with echo turned off in the shell.  Don't worry about
+         * things like SIGXCPU and SIGVTALRM for now.
+         */
+        sigemptyset(&sa.sa_mask);
+        sa.sa_flags = 0;                /* don't restart system calls */
+        sa.sa_handler = handler;
+        (void)sigaction(SIGALRM, &sa, &savealrm);
+        (void)sigaction(SIGHUP, &sa, &savehup);
+        (void)sigaction(SIGINT, &sa, &saveint);
+        (void)sigaction(SIGPIPE, &sa, &savepipe);
+        (void)sigaction(SIGQUIT, &sa, &savequit);
+        (void)sigaction(SIGTERM, &sa, &saveterm);
+        (void)sigaction(SIGTSTP, &sa, &savetstp);
+        (void)sigaction(SIGTTIN, &sa, &savettin);
+        (void)sigaction(SIGTTOU, &sa, &savettou);
+
+        if (!(flags & RPP_STDIN))
+                (void)write(output, prompt, strlen(prompt));
+        end = buf + bufsiz - 1;
+        p = buf;
+        while ((nr = read(input, &ch, 1)) == 1 && ch != '\n' && ch != '\r') {
+                if (p < end) {
+                        if ((flags & RPP_SEVENBIT))
+                                ch &= 0x7f;
+                        if (isalpha(ch)) {
+                                if ((flags & RPP_FORCELOWER))
+                                        ch = (char)tolower(ch);
+                                if ((flags & RPP_FORCEUPPER))
+                                        ch = (char)toupper(ch);
                         }
+                        *p++ = ch;
                 }
-                *p = '\0';
-                save_errno = errno;
-                if (!(term.c_lflag & ECHO))
-                        (void)write(output, "\n", 1);
         }
+        *p = '\0';
+        save_errno = errno;
+        if (!(term.c_lflag & ECHO))
+                (void)write(output, "\n", 1);
 
         /* Restore old terminal settings and signals. */
         if (memcmp(&term, &oterm, sizeof(term)) != 0) {
                 while (tcsetattr(input, TCSAFLUSH|TCSASOFT, &oterm) == -1 &&
-                    errno == EINTR)
+                    errno == EINTR && !signo[SIGTTOU])
                         continue;
         }
         (void)sigaction(SIGALRM, &savealrm, NULL);