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

msvcrt: fread: Fill buffer on small reads.

Browse Source
This commit is contained in:
Markus Amsler 2006-10-13 00:03:29 +02:00 committed by Alexandre Julliard
parent ef5ed0a42a
commit fdd61a7a35
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/msvcrt/file.c
View File

@ -2524,7 +2524,29 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm
} }
while(rcnt>0) while(rcnt>0)
{ {
int i = _read(file->_file,ptr, rcnt); int i;
/* Fill the buffer on small reads.
* TODO: Use a better buffering strategy.
*/
if (!file->_cnt && size*nmemb <= MSVCRT_BUFSIZ/2 && !(file->_flag & MSVCRT__IONBF)) {
if (file->_bufsiz == 0) {
msvcrt_alloc_buffer(file);
}
file->_cnt = _read(file->_file, file->_base, file->_bufsiz);
file->_ptr = file->_base;
i = (file->_cnt<rcnt) ? file->_cnt : rcnt;
/* If the buffer fill reaches eof but fread wouldn't, clear eof. */
if (i > 0 && i < file->_cnt) {
MSVCRT_fdesc[file->_file].wxflag &= ~WX_ATEOF;
}
if (i > 0) {
memcpy(ptr, file->_ptr, i);
file->_cnt -= i;
file->_ptr += i;
}
} else {
i = _read(file->_file,ptr, rcnt);
}
pread += i; pread += i;
rcnt -= i; rcnt -= i;
/* expose feof condition in the flags /* expose feof condition in the flags