ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Make _filbuf thread safe.

This commit is contained in:
Piotr Caban 2011-05-20 13:21:50 +02:00 committed by Alexandre Julliard
parent 1b26496270
commit f773ad8388
1 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/msvcrt/file.c
View File

@ -2605,35 +2605,46 @@ int CDECL MSVCRT_ferror(MSVCRT_FILE* file)
*/ */
int CDECL MSVCRT__filbuf(MSVCRT_FILE* file) int CDECL MSVCRT__filbuf(MSVCRT_FILE* file)
{ {
unsigned char c;
MSVCRT__lock_file(file);
/* Allocate buffer if needed */ /* Allocate buffer if needed */
if(file->_bufsiz == 0 && !(file->_flag & MSVCRT__IONBF) ) { if(file->_bufsiz == 0 && !(file->_flag & MSVCRT__IONBF))
msvcrt_alloc_buffer(file); msvcrt_alloc_buffer(file);
}
if(!(file->_flag & MSVCRT__IOREAD)) { if(!(file->_flag & MSVCRT__IOREAD)) {
if(file->_flag & MSVCRT__IORW) { if(file->_flag & MSVCRT__IORW)
file->_flag |= MSVCRT__IOREAD; file->_flag |= MSVCRT__IOREAD;
} else { else {
MSVCRT__unlock_file(file);
return MSVCRT_EOF; return MSVCRT_EOF;
} }
} }
if(file->_flag & MSVCRT__IONBF) { if(file->_flag & MSVCRT__IONBF) {
unsigned char c;
int r; int r;
if ((r = read_i(file->_file,&c,1)) != 1) { if ((r = read_i(file->_file,&c,1)) != 1) {
file->_flag |= (r == 0) ? MSVCRT__IOEOF : MSVCRT__IOERR; file->_flag |= (r == 0) ? MSVCRT__IOEOF : MSVCRT__IOERR;
MSVCRT__unlock_file(file);
return MSVCRT_EOF; return MSVCRT_EOF;
} }
MSVCRT__unlock_file(file);
return c; return c;
} else { } else {
file->_cnt = read_i(file->_file, file->_base, file->_bufsiz); file->_cnt = read_i(file->_file, file->_base, file->_bufsiz);
if(file->_cnt<=0) { if(file->_cnt<=0) {
file->_flag |= (file->_cnt == 0) ? MSVCRT__IOEOF : MSVCRT__IOERR; file->_flag |= (file->_cnt == 0) ? MSVCRT__IOEOF : MSVCRT__IOERR;
file->_cnt = 0; file->_cnt = 0;
MSVCRT__unlock_file(file);
return MSVCRT_EOF; return MSVCRT_EOF;
} }
file->_cnt--; file->_cnt--;
file->_ptr = file->_base+1; file->_ptr = file->_base+1;
return *(unsigned char *)file->_base; c = *(unsigned char *)file->_base;
MSVCRT__unlock_file(file);
return c;
} }
} }