- (dtucker) [openbsd-compat/readpassphrase.c] Update to OpenBSD's r1.21.

diff --git a/ChangeLog b/ChangeLog
index 87c236e669a1d37d8f4f31b8e0085b073ca7db65..7c4fad33dfcf4c0e774651624c7a863fe05482ac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
  - (dtucker) [monitor_fdpass.c] Wrap poll.h include in ifdefs.
  - (dtucker) [openbsd-compat/readpassphrase.c] Resync against OpenBSD's r1.18:
    missing restore of SIGTTOU and some whitespace.
+ - (dtucker) [openbsd-compat/readpassphrase.c] Update to OpenBSD's r1.21.
 
 20100112
  - (dtucker) OpenBSD CVS Sync

diff --git a/openbsd-compat/readpassphrase.c b/openbsd-compat/readpassphrase.c
index 16e07e8166ce9ee50a3b32804c5a48f95b11bc9e..8b94863578b25e267642009da18dd3e10bd54ea3 100644 (file)
--- a/openbsd-compat/readpassphrase.c
+++ b/openbsd-compat/readpassphrase.c
@@ -1,7 +1,7 @@
-/*     $OpenBSD: readpassphrase.c,v 1.18 2005/08/08 08:05:34 espie Exp $       */
+/*     $OpenBSD: readpassphrase.c,v 1.21 2008/01/17 16:27:07 millert Exp $     */
 
 /*
- * Copyright (c) 2000-2002 Todd C. Miller <Todd.Miller@courtesan.com>
+ * Copyright (c) 2000-2002, 2007 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
@@ -68,6 +68,8 @@ readpassphrase(const char *prompt, char *buf, size_t bufsiz, int flags)
 
 restart:
        signo = 0;
+       nr = -1;
+       save_errno = 0;
        /*
         * Read and write to /dev/tty if available.  If not, read from
         * stdin and write to stderr unless a tty is required.
@@ -117,26 +119,30 @@ restart:
                oterm.c_lflag |= ECHO;
        }
 
-       if (!(flags & RPP_STDIN))
-               (void)write(output, prompt, strlen(prompt));
-       end = buf + bufsiz - 1;
-       for (p = buf; (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 = tolower(ch);
-                               if ((flags & RPP_FORCEUPPER))
-                                       ch = toupper(ch);
+       /* No I/O if we are already backgrounded. */
+       if (signo != SIGTTOU && signo != SIGTTIN) {
+               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++ = 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) {
@@ -170,7 +176,8 @@ restart:
                }
        }
 
-       errno = save_errno;
+       if (save_errno)
+               errno = save_errno;
        return(nr == -1 ? NULL : buf);
 }