Commit 474b8a97 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

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

parent 53261831

crypto/bio/bss_file.c

+2 −3
Original line number Diff line number Diff line
@@ -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);

         /* 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
@@ -301,7 +300,7 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr) 
			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);

e_os.h

+4 −0
Original line number Diff line number Diff line
@@ -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

#    ifdef OPENSSL_SYS_WIN32_CYGWIN

#      include <io.h>

#      include <fcntl.h>

#    endif



#    define OPENSSL_CONF	"openssl.cnf"

#    define SSLEAY_CONF		OPENSSL_CONF