mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-27 05:21:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

cygwin: drop explicit O_TEXT

Browse Source 
Cygwin binaries should not enforce text mode these days, just
use text mode if the underlying mount point requests it

CLA: trivial

Signed-off-by: Corinna Vinschen <vinschen@redhat.com>

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8248)
This commit is contained in:
Corinna Vinschen 2019-02-15 12:24:47 +01:00 committed by Richard Levitte
parent 1ad2d9404d
commit 9b57e4a1ef
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crypto/bio/bss_file.c
View File

@ -253,9 +253,7 @@ static long file_ctrl(BIO *b, int cmd, long num, void *ptr)
} }
# elif defined(OPENSSL_SYS_WIN32_CYGWIN) # elif defined(OPENSSL_SYS_WIN32_CYGWIN)
int fd = fileno((FILE *)ptr); int fd = fileno((FILE *)ptr);
if (num & BIO_FP_TEXT) if (!(num & BIO_FP_TEXT))
setmode(fd, O_TEXT);
else
setmode(fd, O_BINARY); setmode(fd, O_BINARY);
# endif # endif
} }
@ -279,11 +277,14 @@ static long file_ctrl(BIO *b, int cmd, long num, void *ptr)
ret = 0; ret = 0;
break; break;
} }
# if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32_CYGWIN) # if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WINDOWS)
if (!(num & BIO_FP_TEXT)) if (!(num & BIO_FP_TEXT))
OPENSSL_strlcat(p, "b", sizeof(p)); OPENSSL_strlcat(p, "b", sizeof(p));
else else
OPENSSL_strlcat(p, "t", sizeof(p)); OPENSSL_strlcat(p, "t", sizeof(p));
# elif defined(OPENSSL_SYS_WIN32_CYGWIN)
if (!(num & BIO_FP_TEXT))
OPENSSL_strlcat(p, "b", sizeof(p));
# endif # endif
fp = openssl_fopen(ptr, p); fp = openssl_fopen(ptr, p);
if (fp == NULL) { if (fp == NULL) {