X-Git-Url: https://git.llucax.com/z.facultad/75.06/jacu.git/blobdiff_plain/a63c710f7fbc74f701af980d7d6ac9444298f5c7..7e82309c7b430e006f63193a8fc0319e43822d7a:/src/vfile/vfile.c diff --git a/src/vfile/vfile.c b/src/vfile/vfile.c index bba064f..589d4aa 100644 --- a/src/vfile/vfile.c +++ b/src/vfile/vfile.c @@ -132,20 +132,29 @@ int vfputc(int c, VFILE* vfp) size_t vfread(void* ptr, size_t size, size_t nmemb, VFILE* vfp) { - int i = 0; + int c; + size_t i = 0; size_t total = size * nmemb; /* leo uno a uno y si hay error salgo. */ - while (i < total && (((char*)ptr)[i++] = vfgetc(vfp)) != EOF); - return i % size; + while (i < total) + { + if ((c = vfgetc(vfp)) == EOF) + { + PERR("vfread: EOF"); + break; + } + else ((char*)ptr)[i++] = c; + } + return i / size; } size_t vfwrite(const void *ptr, size_t size, size_t nmemb, VFILE* vfp) { - int i = 0; + size_t i = 0; size_t total = size * nmemb; /* escribo uno a uno y si hay error salgo. */ while (i < total && (vfputc(((char*)ptr)[i++], vfp)) != EOF); - return i % size; + return i / size; } int vfvol_close(VFILE* vfp)