diff options
| author |   miod <miod@openbsd.org> | 2014-04-13 15:25:20 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2014-04-13 15:25:20 +0000 |
| commit | 97222edd40cad3a6e51530425068b83c51d308b1 (patch) | |
| tree | 50438b2fbea63f81d6ac96e9bf4aa302b9538333 /lib/libssl/src/crypto/ui/ui_openssl.c | |
| parent | Import OpenSSL 1.0.1g (diff) | |
| download | wireguard-openbsd-97222edd40cad3a6e51530425068b83c51d308b1.tar.xz wireguard-openbsd-97222edd40cad3a6e51530425068b83c51d308b1.zip | |
Merge conflicts; remove MacOS, Netware, OS/2, VMS and Windows build machinery.
Diffstat (limited to 'lib/libssl/src/crypto/ui/ui_openssl.c')
| -rw-r--r-- | lib/libssl/src/crypto/ui/ui_openssl.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/libssl/src/crypto/ui/ui_openssl.c b/lib/libssl/src/crypto/ui/ui_openssl.c index e319faa47b8..a38c7581e6a 100644 --- a/lib/libssl/src/crypto/ui/ui_openssl.c +++ b/lib/libssl/src/crypto/ui/ui_openssl.c @@ -122,9 +122,15 @@ * sigaction and fileno included. -pedantic would be more appropriate for * the intended purposes, but we can't prevent users from adding -ansi. */ +#if defined(OPENSSL_SYSNAME_VXWORKS) +#include <sys/types.h> +#endif + #if !defined(_POSIX_C_SOURCE) && defined(OPENSSL_SYS_VMS) +#ifndef _POSIX_C_SOURCE #define _POSIX_C_SOURCE 2 #endif +#endif #include <signal.h> #include <stdio.h> #include <string.h> @@ -398,8 +404,8 @@ static int read_till_nl(FILE *in) char buf[SIZE+1]; do { - if (fgets(buf,sizeof(buf),in) == NULL) - break; + if (!fgets(buf,SIZE,in)) + return 0; } while (strchr(buf,'\n') == NULL); return 1; } |