diff --git a/sources/fread.c b/sources/fread.c index 15f6239..46af9f8 100644 --- a/sources/fread.c +++ b/sources/fread.c @@ -5,8 +5,14 @@ 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; + long rc; + + if (size == 0 || nmemb == 0) + return 0; + + bytes = size * nmemb; + rc = Fread(FILE_GET_HANDLE(stream), bytes, ptr); if (rc < 0) { diff --git a/sources/fwrite.c b/sources/fwrite.c index 92e7761..9126067 100644 --- a/sources/fwrite.c +++ b/sources/fwrite.c @@ -10,11 +10,23 @@ 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; + + if (stream->__mode.__append) + { + /* in append mode every write goes to the end of the file, even after fseek() */ + (void)Fseek(0, (int)FILE_GET_HANDLE(stream), SEEK_END); + } + +#ifdef STDIO_MAP_NEWLINE if (stream->__mode.__binary) { rc = Fwrite(fd, n, ptr);