| @@ -122,26 +122,30 @@ readpassphrase(const char *prompt, char | | | @@ -122,26 +122,30 @@ readpassphrase(const char *prompt, char |
122 | #else /* _WIN32 && !__CYGWIN__ */ | | 122 | #else /* _WIN32 && !__CYGWIN__ */ |
123 | | | 123 | |
124 | #include <assert.h> | | 124 | #include <assert.h> |
125 | #include <ctype.h> | | 125 | #include <ctype.h> |
126 | #include <fcntl.h> | | 126 | #include <fcntl.h> |
127 | #ifdef HAVE_PATHS_H | | 127 | #ifdef HAVE_PATHS_H |
128 | #include <paths.h> | | 128 | #include <paths.h> |
129 | #endif | | 129 | #endif |
130 | #include <signal.h> | | 130 | #include <signal.h> |
131 | #include <string.h> | | 131 | #include <string.h> |
132 | #include <termios.h> | | 132 | #include <termios.h> |
133 | #include <unistd.h> | | 133 | #include <unistd.h> |
134 | | | 134 | |
| | | 135 | #ifndef _PATH_TTY |
| | | 136 | #define _PATH_TTY "/dev/tty" |
| | | 137 | #endif |
| | | 138 | |
135 | #ifdef TCSASOFT | | 139 | #ifdef TCSASOFT |
136 | # define _T_FLUSH (TCSAFLUSH|TCSASOFT) | | 140 | # define _T_FLUSH (TCSAFLUSH|TCSASOFT) |
137 | #else | | 141 | #else |
138 | # define _T_FLUSH (TCSAFLUSH) | | 142 | # define _T_FLUSH (TCSAFLUSH) |
139 | #endif | | 143 | #endif |
140 | | | 144 | |
141 | /* SunOS 4.x which lacks _POSIX_VDISABLE, but has VDISABLE */ | | 145 | /* SunOS 4.x which lacks _POSIX_VDISABLE, but has VDISABLE */ |
142 | #if !defined(_POSIX_VDISABLE) && defined(VDISABLE) | | 146 | #if !defined(_POSIX_VDISABLE) && defined(VDISABLE) |
143 | # define _POSIX_VDISABLE VDISABLE | | 147 | # define _POSIX_VDISABLE VDISABLE |
144 | #endif | | 148 | #endif |
145 | | | 149 | |
146 | #define M(a,b) (a > b ? a : b) | | 150 | #define M(a,b) (a > b ? a : b) |
147 | #define MAX_SIGNO M(M(M(SIGALRM, SIGHUP), \ | | 151 | #define MAX_SIGNO M(M(M(SIGALRM, SIGHUP), \ |