Ajusto compilacion

[z.facultad/75.06/jacu.git] / src / vfile / vfile.c

diff --git a/src/vfile/vfile.c b/src/vfile/vfile.c
index 05ef241f71da76a48727626fff0bac7bbcb63853..bba064fa882d3b856a8ee01014c3c381a292b36e 100644 (file)
--- a/src/vfile/vfile.c
+++ b/src/vfile/vfile.c
@@ -22,7 +22,7 @@
  * Autores: Leandro Lucarella <llucare@fi.uba.ar>
  *----------------------------------------------------------------------------
  *
  * Autores: Leandro Lucarella <llucare@fi.uba.ar>
  *----------------------------------------------------------------------------
  *

- * $Id: bufford.c 624 2004-05-30 20:18:04Z llucare $
+ * $Id$

  *
  */
 
  *
  */
 


@@ -98,6 +98,11 @@ int vfclose(VFILE* vfp)
        return ret;
 }
 
        return ret;
 }
 

+int vfeof(VFILE* vfp)
+{
+       return vfp->lastvol && feof(vfp->fp);
+}
+

 int vfgetc(VFILE* vfp)
 {
        int c;
 int vfgetc(VFILE* vfp)
 {
        int c;


@@ -127,19 +132,19 @@ int vfputc(int c, VFILE* vfp)
 
 size_t vfread(void* ptr, size_t size, size_t nmemb, VFILE* vfp)
 {
 
 size_t vfread(void* ptr, size_t size, size_t nmemb, VFILE* vfp)
 {

-       int i;
+       int i = 0;

        size_t total = size * nmemb;
        /* leo uno a uno y si hay error salgo. */
        size_t total = size * nmemb;
        /* leo uno a uno y si hay error salgo. */

-       for (i = 0; i < total && (((char*)ptr)[i] = vfgetc(vfp)) != EOF; ++i);
+       while (i < total && (((char*)ptr)[i++] = vfgetc(vfp)) != EOF);

        return i % size;
 }
 
 size_t vfwrite(const void *ptr, size_t size, size_t nmemb, VFILE* vfp)
 {
        return i % size;
 }
 
 size_t vfwrite(const void *ptr, size_t size, size_t nmemb, VFILE* vfp)
 {

-       int i;
+       int i = 0;

        size_t total = size * nmemb;
        /* escribo uno a uno y si hay error salgo. */
        size_t total = size * nmemb;
        /* escribo uno a uno y si hay error salgo. */

-       for (i = 0; i < total && (vfputc(((char*)ptr)[i], vfp)) != EOF; ++i);
+       while (i < total && (vfputc(((char*)ptr)[i++], vfp)) != EOF);

        return i % size;
 }
 
        return i % size;
 }