generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make sure fd is defined where it should.

Browse Source 
PR: 849
This commit is contained in:
Richard Levitte 2004-03-21 22:36:27 +00:00
parent 7f663ce430
commit 18a6333180
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crypto/bio/bss_file.c
View File

@ -213,6 +213,8 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr)
b->shutdown=(int)num&BIO_CLOSE; b->shutdown=(int)num&BIO_CLOSE;
b->ptr=(char *)ptr; b->ptr=(char *)ptr;
b->init=1; b->init=1;
{
int fd = fileno((FILE*)ptr);
#if defined(OPENSSL_SYS_WINDOWS) #if defined(OPENSSL_SYS_WINDOWS)
if (num & BIO_FP_TEXT) if (num & BIO_FP_TEXT)
_setmode(fd,_O_TEXT); _setmode(fd,_O_TEXT);
@ -222,12 +224,10 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *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(fileno((FILE *)ptr),O_TEXT); _setmode(fd,O_TEXT);
else else
_setmode(fileno((FILE *)ptr),O_BINARY); _setmode(fd,O_BINARY);
#elif defined(OPENSSL_SYS_MSDOS) #elif defined(OPENSSL_SYS_MSDOS)
{
int fd = fileno((FILE*)ptr);
/* Set correct text/binary mode */ /* Set correct text/binary mode */
if (num & BIO_FP_TEXT) if (num & BIO_FP_TEXT)
_setmode(fd,_O_TEXT); _setmode(fd,_O_TEXT);
@ -242,13 +242,13 @@ 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)
if (num & BIO_FP_TEXT) if (num & BIO_FP_TEXT)
setmode(fileno((FILE *)ptr), O_TEXT); setmode(fd, O_TEXT);
else else
setmode(fileno((FILE *)ptr), O_BINARY); setmode(fd, O_BINARY);
#endif #endif
}
break; break;
case BIO_C_SET_FILENAME: case BIO_C_SET_FILENAME:
file_free(b); file_free(b);