diff --git a/sources/fread.c b/sources/fread.c index 15f6239..c4b87b7 100644 --- a/sources/fread.c +++ b/sources/fread.c @@ -5,19 +5,36 @@ size_t fread(void *ptr, size_t size, size_t nmemb, FILE *stream) { - size_t bytes = size * nmemb; - long rc = Fread(FILE_GET_HANDLE(stream), bytes, ptr); + size_t bytes; + size_t got = 0; + long rc; + + if (size == 0 || nmemb == 0) + return 0; + + bytes = size * nmemb; + + if (stream->__pushback != EOF) + { + /* a character pushed back by ungetc() comes first */ + *(unsigned char *)ptr = (unsigned char)stream->__pushback; + stream->__pushback = EOF; + ptr = (unsigned char *)ptr + 1; + --bytes; + ++got; + } + + rc = bytes > 0 ? Fread(FILE_GET_HANDLE(stream), bytes, ptr) : 0; if (rc < 0) { stream->__error = 1; __set_errno(-rc); - rc = 0; } else { - if (rc < bytes) + if ((size_t)rc < bytes) stream->__eof = 1; - rc /= size; + got += rc; } - return rc; + return got / size; } diff --git a/sources/fwrite.c b/sources/fwrite.c index 92e7761..021fe1a 100644 --- a/sources/fwrite.c +++ b/sources/fwrite.c @@ -10,11 +10,17 @@ size_t fwrite(const void *ptr, size_t size, size_t nmemb, FILE *stream) { long rc; - size_t n = size * nmemb; - + size_t n; #ifdef STDIO_MAP_NEWLINE int fd = (int)FILE_GET_HANDLE(stream); +#endif + + if (size == 0 || nmemb == 0) + return 0; + n = size * nmemb; + +#ifdef STDIO_MAP_NEWLINE if (stream->__mode.__binary) { rc = Fwrite(fd, n, ptr);