Commit a81cc6e8 authored by Corinna Vinschen's avatar Corinna Vinschen Committed by Richard Levitte
Browse files

cygwin: drop explicit O_TEXT 



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

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

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8248)

(cherry picked from commit 9b57e4a1)
parent 5cd8faed

crypto/bio/bss_file.c

+5 −4
Original line number Diff line number Diff line
@@ -253,9 +253,7 @@ static long file_ctrl(BIO *b, int cmd, long num, void *ptr) 
            }

#  elif defined(OPENSSL_SYS_WIN32_CYGWIN)

            int fd = fileno((FILE *)ptr);

            if (num & BIO_FP_TEXT)

                setmode(fd, O_TEXT);

            else

            if (!(num & BIO_FP_TEXT))

                setmode(fd, O_BINARY);

#  endif

        }
@@ -279,11 +277,14 @@ static long file_ctrl(BIO *b, int cmd, long num, void *ptr) 
            ret = 0;

            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))

            OPENSSL_strlcat(p, "b", sizeof(p));

        else

            OPENSSL_strlcat(p, "t", sizeof(p));

#  elif defined(OPENSSL_SYS_WIN32_CYGWIN)

        if (!(num & BIO_FP_TEXT))

            OPENSSL_strlcat(p, "b", sizeof(p));

#  endif

        fp = openssl_fopen(ptr, p);

        if (fp == NULL) {