Commit 3077dd40 authored by Corinna Vinschen's avatar Corinna Vinschen
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

CLA: trivial

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

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8249)
parent fff469b2

crypto/bio/bss_file.c

+9 −2
Original line number Diff line number Diff line
@@ -361,12 +361,16 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr) 
                } else

                    _setmode(fd, _O_BINARY);

            }

#  elif defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_WIN32_CYGWIN)

#  elif defined(OPENSSL_SYS_OS2)

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

            if (num & BIO_FP_TEXT)

                setmode(fd, O_TEXT);

            else

                setmode(fd, O_BINARY);

#  elif defined(OPENSSL_SYS_WIN32_CYGWIN)

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

            if (!(num & BIO_FP_TEXT))

                setmode(fd, O_BINARY);

#  endif

        }

        break;
@@ -389,11 +393,14 @@ static long MS_CALLBACK 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_OS2) || defined(OPENSSL_SYS_WIN32_CYGWIN)

#  if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_OS2)

        if (!(num & BIO_FP_TEXT))

            strcat(p, "b");

        else

            strcat(p, "t");

#  elif defined(OPENSSL_SYS_WIN32_CYGWIN)

        if (!(num & BIO_FP_TEXT))

            strcat(p, "b");

#  endif

#  if defined(OPENSSL_SYS_NETWARE)

        if (!(num & BIO_FP_TEXT))