Changeset 2552Tweet

Timestamp:

Jul 16, 2008, 11:24:09 PM (12 years ago)

Author:

Sam Hocevar

Message:

• Implement freopen64, fsetpos64 and fseeko64 for OpenSolaris?.

Location:

zzuf/trunk

Files:

• configure.ac (modified) (1 diff)
• doc/libzzuf.3 (modified) (1 diff)
• src/lib-stream.c (modified) (5 diffs)

zzuf/trunk/configure.ac

@@ -39 +39 @@
 
 AC_CHECK_FUNCS(setenv waitpid setrlimit gettimeofday fork kill pipe _pipe)
-AC_CHECK_FUNCS(open64 __open64 lseek64 __lseek64 mmap64 fopen64 __fopen64 __freopen64 dup dup2 fseeko __fseeko64 __fsetpos64 _IO_getc getline getdelim __getdelim fgetln __srefill __filbuf map_fd memalign posix_memalign aio_read accept bind connect socket readv pread recv recvfrom recvmsg mmap valloc sigaction getpagesize getc_unlocked getchar_unlocked fgetc_unlocked fread_unlocked fgets_unlocked)
+AC_CHECK_FUNCS(open64 __open64 lseek64 __lseek64 mmap64 fopen64 __fopen64 freopen64 __freopen64 dup dup2 fseeko fseeko64 __fseeko64 fsetpos64 __fsetpos64 _IO_getc getline getdelim __getdelim fgetln __srefill __filbuf map_fd memalign posix_memalign aio_read accept bind connect socket readv pread recv recvfrom recvmsg mmap valloc sigaction getpagesize getc_unlocked getchar_unlocked fgetc_unlocked fread_unlocked fgets_unlocked)
 
 AC_CHECK_TYPES(sighandler_t, [], [],

zzuf/trunk/doc/libzzuf.3

@@ -109 +109 @@
 \fB__open64\fR(), \fB__lseek64\fR(), \fB__filbuf\fR()
 .TP
+Required on OpenSolaris:
+\fBfreopen64\fR(), \fBfseeko64\fR(), \fBfsetpos64\fR()
+.TP
 Signal handling:
 \fBsignal\fR(), \fBsigaction\fR()

zzuf/trunk/src/lib-stream.c

@@ -63 +63 @@
 static FILE *  (*ORIG(freopen))  (const char *path, const char *mode,
                                   FILE *stream);
+#if defined HAVE_FREOPEN64
+static FILE *  (*ORIG(freopen64))(const char *path, const char *mode,
+                                  FILE *stream);
+#endif
 #if defined HAVE___FREOPEN64
 static FILE *  (*ORIG(__freopen64)) (const char *path, const char *mode,
@@ -71 +75 @@
 static int     (*ORIG(fseeko))   (FILE *stream, off_t offset, int whence);
 #endif
+#if defined HAVE_FSEEKO64
+static int     (*ORIG(fseeko64)) (FILE *stream, off_t offset, int whence);
+#endif
 #if defined HAVE___FSEEKO64
 static int     (*ORIG(__fseeko64)) (FILE *stream, off_t offset, int whence);
+#endif
+#if defined HAVE_FSETPOS64
+static int     (*ORIG(fsetpos64))(FILE *stream, const fpos64_t *pos);
 #endif
 #if defined HAVE___FSETPOS64
@@ -206 +216 @@
 }
 
+#if defined HAVE_FREOPEN64
+FILE *NEW(freopen64)(const char *path, const char *mode, FILE *stream)
+{
+    FILE *ret; FREOPEN(freopen64); return ret;
+}
+#endif
+
 #if defined HAVE___FREOPEN64
 FILE *NEW(__freopen64)(const char *path, const char *mode, FILE *stream)
@@ -263 +280 @@
 #endif
 
+#if defined HAVE_FSEEKO64
+int NEW(fseeko64)(FILE *stream, off64_t offset, int whence)
+{
+    int ret; FSEEK(fseeko64, ftello); return ret;
+}
+#endif
+
 #if defined HAVE___FSEEKO64
 int NEW(__fseeko64)(FILE *stream, off64_t offset, int whence)
@@ -270 +294 @@
 #endif
 
+#define FSETPOS(fn) \
+    do \
+    { \
+        int fd; \
+        LOADSYM(fn); \
+        fd = fileno(stream); \
+        if(!_zz_ready || !_zz_iswatched(fd) || !_zz_isactive(fd)) \
+            return ORIG(fn)(stream, pos); \
+        _zz_lock(fd); \
+        ret = ORIG(fn)(stream, pos); \
+        _zz_unlock(fd); \
+        debug("%s([%i], %lli) = %i", __func__, \
+              fd, (long long int)*pos, ret); \
+        /* On HP-UX at least, fpos64_t == int64_t */ \
+        _zz_setpos(fd, (int64_t)*pos); \
+    } \
+    while(0)
+
+#if defined HAVE_FSETPOS64
+int NEW(fsetpos64)(FILE *stream, const fpos64_t *pos)
+{
+    int ret; FSETPOS(fsetpos64); return ret;
+}
+#endif
+
 #if defined HAVE___FSETPOS64
 int NEW(__fsetpos64)(FILE *stream, const fpos64_t *pos)
 {
-    int ret, fd;
-
-    LOADSYM(__fsetpos64);
-    fd = fileno(stream);
-    if(!_zz_ready || !_zz_iswatched(fd) || !_zz_isactive(fd))
-        return ORIG(__fsetpos64)(stream, pos);
-    _zz_lock(fd);
-    ret = ORIG(__fsetpos64)(stream, pos);
-    _zz_unlock(fd);
-    debug("%s([%i], %lli) = %i", __func__,
-          fd, (long long int)*pos, ret);
-    /* On HP-UX at least, fpos64_t == int64_t */
-    _zz_setpos(fd, (int64_t)*pos);
-
-    return ret;
+    int ret; FSETPOS(__fsetpos64); return ret;
 }
 #endif