Make cygwin work in directories mounted with 'text' attribute.

diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c
index ad4b301388106a94a8a6dfe00167ff6351725bf5..93727685cf5909563332d30e50b3c816c512eaa2 100644 (file)
--- a/crypto/bio/bss_file.c
+++ b/crypto/bio/bss_file.c
@@ -279,8 +279,7 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr)
                        _setmode(fd,_O_BINARY);
 #elif defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_CLIB)
                int fd = fileno((FILE*)ptr);
                        _setmode(fd,_O_BINARY);
 #elif defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_CLIB)
                int fd = fileno((FILE*)ptr);

-         /* Under CLib there are differences in file modes
-         */
+               /* Under CLib there are differences in file modes */

                if (num & BIO_FP_TEXT)
                        _setmode(fd,O_TEXT);
                else
                if (num & BIO_FP_TEXT)
                        _setmode(fd,O_TEXT);
                else


@@ -301,7 +300,7 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr)
                        else
                                _setmode(fd,_O_BINARY);
                        }
                        else
                                _setmode(fd,_O_BINARY);
                        }

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

                int fd = fileno((FILE*)ptr);
                if (num & BIO_FP_TEXT)
                        setmode(fd, O_TEXT);
                int fd = fileno((FILE*)ptr);
                if (num & BIO_FP_TEXT)
                        setmode(fd, O_TEXT);

diff --git a/e_os.h b/e_os.h
index 5068d1bd74feaa3acef2e73736937be7a97b8f7e..25e9e625f0640b22b2a383363cd06f049a4175b1 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -408,6 +408,10 @@ static unsigned int _strlen31(const char *str)
 #      define setvbuf(a, b, c, d) setbuffer((a), (b), (d))
        typedef unsigned long clock_t;
 #    endif
 #      define setvbuf(a, b, c, d) setbuffer((a), (b), (d))
        typedef unsigned long clock_t;
 #    endif

+#    ifdef OPENSSL_SYS_WIN32_CYGWIN
+#      include <io.h>
+#      include <fcntl.h>
+#    endif

 
 #    define OPENSSL_CONF       "openssl.cnf"
 #    define SSLEAY_CONF                OPENSSL_CONF
 
 #    define OPENSSL_CONF       "openssl.cnf"
 #    define SSLEAY_CONF                OPENSSL_CONF