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

This commit is contained in:
Andy Polyakov 2005-11-03 16:43:53 +00:00
parent 53261831f1
commit 474b8a9716
2 changed files with 6 additions and 3 deletions

View File

@ -279,8 +279,7 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr)
_setmode(fd,_O_BINARY); _setmode(fd,_O_BINARY);
#elif defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_CLIB) #elif defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_CLIB)
int fd = fileno((FILE*)ptr); 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) if (num & BIO_FP_TEXT)
_setmode(fd,O_TEXT); _setmode(fd,O_TEXT);
else else
@ -301,7 +300,7 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr)
else else
_setmode(fd,_O_BINARY); _setmode(fd,_O_BINARY);
} }
#elif defined(OPENSSL_SYS_OS2) #elif defined(OPENSSL_SYS_OS2) || 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); setmode(fd, O_TEXT);

4
e_os.h
View File

@ -408,6 +408,10 @@ static unsigned int _strlen31(const char *str)
# define setvbuf(a, b, c, d) setbuffer((a), (b), (d)) # define setvbuf(a, b, c, d) setbuffer((a), (b), (d))
typedef unsigned long clock_t; typedef unsigned long clock_t;
# endif # endif
# ifdef OPENSSL_SYS_WIN32_CYGWIN
# include <io.h>
# include <fcntl.h>
# endif
# define OPENSSL_CONF "openssl.cnf" # define OPENSSL_CONF "openssl.cnf"
# define SSLEAY_CONF OPENSSL_CONF # define SSLEAY_CONF OPENSSL_CONF