Context Navigation

Changeset 2407

Timestamp:

06/15/08 15:50:06 (5 years ago)

Author:

sam

Message:

Location:

libcaca/trunk/cucul

Files:

r2406	r2407
286	286	__extern cucul_file_t cucul_file_open(char const , const char *);
287	287	__extern int cucul_file_close(cucul_file_t *);
	288	__extern uint64_t cucul_file_tell(cucul_file_t *);
288	289	__extern size_t cucul_file_read(cucul_file_t , void , size_t);
289	290	__extern size_t cucul_file_write(cucul_file_t , const void , size_t);

-                      r2406
+                      r2407
     z_stream stream;
     gzFile gz;
     int eof, zip;
+    int eof, zip, total;
 #   endif
     FILE *f;
 …
     cucul_file_t *fp = malloc(sizeof(*fp));
     fp->readonly = !strchr(mode, 'r');
+    fp->readonly = strchr(mode, 'r');
 #   if defined HAVE_ZLIB_H
 …
     fp->eof = 0;
     fp->zip = 0;
+    fp->total = 0;
     if(fp->readonly)
 …
+}
+uint64_t cucul_file_tell(cucul_file_t *fp)
+{
+#if defined __KERNEL__
+    return 0;
+#elif defined HAVE_ZLIB_H
+    if(fp->zip)
+        return fp->total;
+    return gztell(fp->gz);
+#else
+    return ftell(fp->f);
+#endif
+}
 size_t cucul_file_read(cucul_file_t *fp, void *ptr, size_t size)
+{
 …
     return 0;
 #elif defined HAVE_ZLIB_H
+    /* FIXME: zip files are not supported */
     return gzwrite(fp->gz, ptr, size);
 #else
 …
+        {
             fp->eof = 1;
+            fp->total += total_read;
             return total_read;
+        }
 …
+    }
+    fp->total += total_read;
     return total_read;
+}

Note: See TracChangeset for help on using the changeset viewer.