- (bal) Fixed _DISABLE_VPOSIX in readpassphrase.c.

diff --git a/ChangeLog b/ChangeLog
index b59c8013ce3c018a11bf42d75439042c68d2ba14..817c3fcec61da6c7d00d6a9a95a46b47ce1934f8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 20010629
  - (bal) Removed net_aton() since we don't use it any more
+ - (bal) Fixed _DISABLE_VPOSIX in readpassphrase.c.
 
 20010628
  - (djm) Sync openbsd-compat with -current libc

diff --git a/openbsd-compat/readpassphrase.c b/openbsd-compat/readpassphrase.c
index 10f0e0ed30b3748b34332c5382a12d3fb56e637d..8e5785520a509d75897583fe28276a57826b6a17 100644 (file)
--- a/openbsd-compat/readpassphrase.c
+++ b/openbsd-compat/readpassphrase.c
@@ -51,7 +51,9 @@ readpassphrase(prompt, buf, bufsiz, flags)
 {
        struct termios term;
        char ch, *p, *end;
+#ifdef _POSIX_VDISABLE
        u_char status;
+#endif
        int echo, input, output;
        sigset_t oset, nset;
 
@@ -86,7 +88,9 @@ readpassphrase(prompt, buf, bufsiz, flags)
 
        /* Turn off echo if possible. */
        echo = 0;
+#ifdef _POSIX_VDISABLE
        status = _POSIX_VDISABLE;
+#endif
        if (tcgetattr(input, &term) == 0) {
                if (!(flags & RPP_ECHO_ON) && (term.c_lflag & ECHO)) {
                        echo = 1;
@@ -124,7 +128,11 @@ readpassphrase(prompt, buf, bufsiz, flags)
                }
        }
        *p = '\0';
+#ifdef _POSIX_VDISABLE
        if (echo || status != _POSIX_VDISABLE) {
+#else
+       if (echo) {
+#endif
                if (echo) {
                        (void)write(output, "\n", 1);
                        term.c_lflag |= ECHO;