Changeset 1594

Timestamp:

01/07/07 10:34:42 (6 years ago)

Author:

sam

Message:

• Implemented fseeko().

Location:

zzuf/trunk

Files:

• configure.ac (modified) (1 diff)
• doc/zzuf.1 (modified) (1 diff)
• src/load-stream.c (modified) (4 diffs)

zzuf/trunk/configure.ac

@@ -16 +16 @@
 
 AC_CHECK_HEADERS(inttypes.h stdint.h getopt.h)
-AC_CHECK_FUNCS(open64 lseek64 mmap64 fopen64 getline getdelim __getdelim fgetln)
+AC_CHECK_FUNCS(open64 lseek64 mmap64 fopen64 fseeko getline getdelim __getdelim fgetln)
 AC_CHECK_TYPES(sighandler_t, [], [],
   [#define _GNU_SOURCE

zzuf/trunk/doc/zzuf.1

@@ -255 +255 @@
 .TP
 Standard IO streams:
-\fBfopen\fR(), \fBfseek\fR(), \fBrewind\fR(), \fBfread\fR(), \fBgetc\fR(),
-\fBfgetc\fR(), \fBfgets\fR(), \fBungetc\fR(), \fBfclose\fR()
+\fBfopen\fR(), \fBfseek\fR(), \fBfseeko\fR(), \fBrewind\fR(), \fBfread\fR(),
+\fBgetc\fR(), \fBfgetc\fR(), \fBfgets\fR(), \fBungetc\fR(), \fBfclose\fR()
 .TP
 GNU libc specific:

zzuf/trunk/src/load-stream.c

@@ -30 +30 @@
 
 #include <stdio.h>
+#include <sys/types.h>
 
 #include "libzzuf.h"
@@ -42 +43 @@
 #endif
 static int     (*fseek_orig)   (FILE *stream, long offset, int whence);
+#ifdef HAVE_FSEEKO
+static int     (*fseeko_orig)  (FILE *stream, off_t offset, int whence);
+#endif
 static void    (*rewind_orig)  (FILE *stream);
 static size_t  (*fread_orig)   (void *ptr, size_t size, size_t nmemb,
@@ -76 +80 @@
 #endif
     LOADSYM(fseek);
+#ifdef HAVE_FSEEKO
+    LOADSYM(fseeko);
+#endif
     LOADSYM(rewind);
     LOADSYM(fread);
@@ -129 +136 @@
 #endif
 
+#define FSEEK(fn, fn2) \
+    do \
+    { \
+        int fd; \
+        if(!_zz_ready) \
+            LOADSYM(fn); \
+        fd = fileno(stream); \
+        if(!_zz_ready || !_zz_iswatched(fd)) \
+            return ORIG(fn)(stream, offset, whence); \
+        _zz_disabled = 1; \
+        ret = ORIG(fn)(stream, offset, whence); \
+        _zz_disabled = 0; \
+        debug(STR(fn)"([%i], %lli, %i) = %i", \
+              fd, (long long int)offset, whence, ret); \
+        if(ret == 0) \
+        { \
+            /* FIXME: check what happens when fseek()ing a pipe */ \
+            switch(whence) \
+            { \
+                case SEEK_END: \
+                    offset = fn2(stream); \
+                    /* fall through */ \
+                case SEEK_SET: \
+                    _zz_setpos(fd, offset); \
+                    break; \
+                case SEEK_CUR: \
+                    _zz_addpos(fd, offset); \
+                    break; \
+            } \
+        } \
+    } while(0)
+
 int fseek(FILE *stream, long offset, int whence)
 {
-    int ret, fd;
-
-    if(!_zz_ready)
-        LOADSYM(fseek);
-    fd = fileno(stream);
-    if(!_zz_ready || !_zz_iswatched(fd))
-        return fseek_orig(stream, offset, whence);
-
-    _zz_disabled = 1;
-    ret = fseek_orig(stream, offset, whence);
-    _zz_disabled = 0;
-    debug("fseek([%i], %li, %i) = %i", fd, offset, whence, ret);
-    if(ret != 0)
-        return ret;
-
-    /* FIXME: check what happens when fseek()ing a pipe */
-    switch(whence)
-    {
-        case SEEK_END:
-            offset = ftell(stream);
-            /* fall through */
-        case SEEK_SET:
-            _zz_setpos(fd, offset);
-            break;
-        case SEEK_CUR:
-            _zz_addpos(fd, offset);
-            break;
-    }
-    return 0;
-}
+    int ret; FSEEK(fseek, ftell); return ret;
+}
+
+#ifdef HAVE_FSEEKO
+int fseeko(FILE *stream, off_t offset, int whence)
+{
+    int ret; FSEEK(fseeko, ftello); return ret;
+}
+#endif
 
 void rewind(FILE *stream)