Changeset 2528

Timestamp:

07/15/08 22:16:11 (3 months ago)

Author:

sam

Message:

• Implement additional functions required on HP-UX: fopen64, fseeko64, freopen64, open64, lseek64.

Location:

zzuf/trunk

Files:

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

zzuf/trunk/configure.ac

@@ -39 +39 @@
 
 AC_CHECK_FUNCS(setenv waitpid setrlimit gettimeofday fork kill pipe _pipe)
-AC_CHECK_FUNCS(open64 lseek64 mmap64 fopen64 dup dup2 fseeko _IO_getc getline getdelim __getdelim fgetln __srefill 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 mmap64 fopen64 __fopen64 __freopen64 dup dup2 fseeko __fseeko64 _IO_getc getline getdelim __getdelim fgetln __srefill 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

@@ -94 +94 @@
 \fBfree\fR(), \fBmemalign\fR(), \fBposix_memalign\fR()
 .TP
-Linux-specific:
+Required on Linux:
 \fBopen64\fR(), \fBlseek64\fR(), \fBmmap64\fR(), \fB_IO_getc\fR(),
 \fBgetline\fR(), \fBgetdelim\fR(), \fB__getdelim\fR(), \fBgetc_unlocked\fR(),
@@ -100 +100 @@
 \fBfread_unlocked\fR()
 .TP
-BSD-specific:
+Required on BSD systems:
 \fBfgetln\fR(), \fB__srefill\fR()
 .TP
-Mac OS X-specific:
+Required on Mac OS X:
 \fBmap_fd\fR()
+.TP
+Required on HP-UX:
+\fB__fopen64\fR(), \fB__fseeko64\fR(), \fB__freopen64\fR(), \fB__open64\fR(),
+\fB__lseek64\fR()
 .TP
 Signal handling:

zzuf/trunk/src/lib-fd.c

@@ -84 +84 @@
 static int     (*ORIG(open64))  (const char *file, int oflag, ...);
 #endif
+#if defined HAVE___OPEN64
+static int     (*ORIG(__open64))(const char *file, int oflag, ...);
+#endif
 #if defined HAVE_DUP
 static int     (*ORIG(dup))     (int oldfd);
@@ -133 +136 @@
 #if defined HAVE_LSEEK64
 static off64_t (*ORIG(lseek64)) (int fd, off64_t offset, int whence);
+#endif
+#if defined HAVE___LSEEK64
+static off64_t (*ORIG(__lseek64)) (int fd, off64_t offset, int whence);
 #endif
 static int     (*ORIG(close))   (int fd);
@@ -177 +183 @@
 {
     int ret; OPEN(open64); return ret;
+}
+#endif
+
+#if defined HAVE___OPEN64
+int NEW(__open64)(const char *file, int oflag, ...)
+{
+    int ret; OPEN(__open64); return ret;
 }
 #endif
@@ -523 +536 @@
 off64_t NEW(lseek64)(int fd, off64_t offset, int whence)
 {
-    off64_t ret;
-    LSEEK(lseek64, off64_t);
-    return ret;
+    off64_t ret; LSEEK(lseek64, off64_t); return ret;
+}
+#endif
+
+#if defined HAVE___LSEEK64
+off64_t NEW(__lseek64)(int fd, off64_t offset, int whence)
+{
+    off64_t ret; LSEEK(__lseek64, off64_t); return ret;
 }
 #endif

zzuf/trunk/src/lib-stream.c

@@ -49 +49 @@
 static FILE *  (*ORIG(fopen64))  (const char *path, const char *mode);
 #endif
+#if defined HAVE___FOPEN64
+static FILE *  (*ORIG(__fopen64))(const char *path, const char *mode);
+#endif
 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
 static int     (*ORIG(fseek))    (FILE *stream, long offset, int whence);
 #if defined HAVE_FSEEKO
 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
 static void    (*ORIG(rewind))   (FILE *stream);
@@ -135 +145 @@
 #endif
 
+#if defined HAVE___FOPEN64
+FILE *NEW(__fopen64)(const char *path, const char *mode)
+{
+    FILE *ret; FOPEN(__fopen64); return ret;
+}
+#endif
+
+#define FREOPEN(fn) \
+    do \
+    { \
+        int fd0 = -1, fd1 = -1, disp = 0; \
+        LOADSYM(fn); \
+        if(_zz_ready && (fd0 = fileno(stream)) >= 0 && _zz_iswatched(fd0)) \
+        { \
+            _zz_unregister(fd0); \
+            disp = 1; \
+        } \
+        _zz_lock(-1); \
+        ret = ORIG(fn)(path, mode, stream); \
+        _zz_unlock(-1); \
+        if(ret && _zz_mustwatch(path)) \
+        { \
+            fd1 = fileno(ret); \
+            _zz_register(fd1); \
+            disp = 1; \
+        } \
+        if(disp) \
+            debug("%s(\"%s\", \"%s\", [%i]) = [%i]", __func__, \
+                  path, mode, fd0, fd1); \
+    } while(0)
+
 FILE *NEW(freopen)(const char *path, const char *mode, FILE *stream)
 {
-    FILE *ret;
-    int fd0 = -1, fd1 = -1, disp = 0;
-
-    LOADSYM(freopen);
-    if(_zz_ready && (fd0 = fileno(stream)) >= 0 && _zz_iswatched(fd0))
-    {
-        _zz_unregister(fd0);
-        disp = 1;
-    }
-
-    _zz_lock(-1);
-    ret = ORIG(freopen)(path, mode, stream);
-    _zz_unlock(-1);
-
-    if(ret && _zz_mustwatch(path))
-    {
-        fd1 = fileno(ret);
-        _zz_register(fd1);
-        disp = 1;
-    }
-
-    if(disp)
-        debug("%s(\"%s\", \"%s\", [%i]) = [%i]", __func__,
-              path, mode, fd0, fd1);
-
-    return ret;
-}
+    FILE *ret; FREOPEN(freopen); return ret;
+}
+
+#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___SREFILL /* Don't fuzz or seek if we have __srefill() */
@@ -212 +235 @@
 {
     int ret; FSEEK(fseeko, ftello); return ret;
+}
+#endif
+
+#if defined HAVE___FSEEKO64
+int NEW(__fseeko64)(FILE *stream, off64_t offset, int whence)
+{
+    int ret; FSEEK(__fseeko64, ftello); return ret;
 }
 #endif