Sinipelto
/
banan-os
forked from Bananymous/banan-os
1
0
Fork 0
Code Pull Requests Activity

LibC: fix fread implementation 

fread() should read until either size*nitems bytes are read or eof
is reached.
This commit is contained in:
Bananymous 2023-09-07 16:00:47 +03:00
parent afe95be42f
commit 0ec4f970f7
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libc/stdio.cpp
View File

@ -255,15 +255,26 @@ size_t fread(void* buffer, size_t size, size_t nitems, FILE* file)
{
if (file->eof || nitems * size == 0)
return 0;
long ret = syscall(SYS_READ, file->fd, buffer, size * nitems);
if (ret < 0)
size_t target = size * nitems;
size_t nread = 0;
while (nread < target)
{
file->error = true;
return 0;
size_t ret = syscall(SYS_READ, file->fd, (uint8_t*)buffer + nread, target - nread);
if (ret < 0)
file->error = true;
else if (ret == 0)
file->eof = true;
if (ret <= 0)
return nread;
nread += ret;
}
if (ret == 0)
file->eof = true;
return ret / size;
return nread / size;
}
// TODO