Changeset 2533Tweet

Timestamp:

Jul 16, 2008, 11:52:02 AM (12 years ago)

Author:

Sam Hocevar

Message:

• Implement srefill() for full HP-UX support on parisc-gcc.

Location:

zzuf/trunk

Files:

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

zzuf/trunk/configure.ac

@@ -39 +39 @@
 
 AC_CHECK_FUNCS(setenv waitpid setrlimit gettimeofday fork kill pipe _pipe)
-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_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_TYPES(sighandler_t, [], [],

zzuf/trunk/doc/libzzuf.3

@@ -107 +107 @@
 .TP
 Required on HP-UX:
-\fB__fopen64\fR(), \fB__fseeko64\fR(), \fB__freopen64\fR(), \fB__open64\fR(),
-\fB__lseek64\fR()
+\fB__open64\fR(), \fB__lseek64\fR(), \fB__filbuf\fR()
 .TP
 Signal handling:

zzuf/trunk/src/lib-stream.c

@@ -40 +40 @@
 #include "fd.h"
 
+#if defined HAVE___SREFILL || defined HAVE___FILBUF
+#   define HAVE_REFILL_STDIO
+#endif
+
 #if defined HAVE___SREFILL
 int NEW(__srefill)(FILE *fp);
+#endif
+
+#if defined HAVE___FILBUF
+int NEW(__filbuf)(FILE *fp);
 #endif
 
@@ -64 +72 @@
 #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
 static void    (*ORIG(rewind))   (FILE *stream);
@@ -115 +126 @@
 #endif
 
+/* Additional HP-UXisms */
+#if defined HAVE___FILBUF
+int            (*ORIG(__filbuf))  (FILE *fp);
+#endif
+
 /* Our function wrappers */
+#if defined HAVE_REFILL_STDIO /* Fuzz fp if we have __srefill() */
+#   define FOPEN_FUZZ() \
+    _zz_fuzz(fd, ret->__ptr, ret->__cnt)
+#else
+#   define FOPEN_FUZZ()
+#endif
+
 #define FOPEN(fn) \
     do \
@@ -130 +153 @@
             _zz_register(fd); \
             debug("%s(\"%s\", \"%s\") = [%i]", __func__, path, mode, fd); \
+            FOPEN_FUZZ(); \
         } \
     } while(0)
@@ -188 +212 @@
 #endif
 
-#if defined HAVE___SREFILL /* Don't fuzz or seek if we have __srefill() */
+#if defined HAVE_REFILL_STDIO /* Don't fuzz or seek if we have __srefill() */
 #   define FSEEK_FUZZ(fn2)
 #else
@@ -245 +269 @@
 #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;
+}
+#endif
+
 void NEW(rewind)(FILE *stream)
 {
@@ -262 +307 @@
     debug("%s([%i])", __func__, fd);
 
-#if defined HAVE___SREFILL /* Don't fuzz or seek if we have __srefill() */
+#if defined HAVE_REFILL_STDIO /* Don't fuzz or seek if we have __srefill() */
 #else
     /* FIXME: check what happens when rewind()ing a pipe */
@@ -269 +314 @@
 }
 
-#if defined HAVE___SREFILL /* Don't fuzz or seek if we have __srefill() */
+#if defined HAVE_REFILL_STDIO /* Don't fuzz or seek if we have __srefill() */
 #   define FREAD_FUZZ() \
     do \
@@ -339 +384 @@
 #endif
 
-#if defined HAVE___SREFILL /* Don't fuzz or seek if we have __srefill() */
+#if defined HAVE_REFILL_STDIO /* Don't fuzz or seek if we have __srefill() */
 #   define FGETC_FUZZ
 #else
@@ -417 +462 @@
 #endif
 
-#if defined HAVE___SREFILL /* Don't fuzz or seek if we have __srefill() */
+#if defined HAVE_REFILL_STDIO /* Don't fuzz or seek if we have __srefill() */
 #   define FGETS_FUZZ(fn, fn2) \
         _zz_lock(fd); \
@@ -501 +546 @@
         fuzz->upos = _zz_getpos(fd) - 1;
         fuzz->uchar = c;
-#if defined HAVE___SREFILL /* Don't fuzz or seek if we have __srefill() */
+#if defined HAVE_REFILL_STDIO /* Don't fuzz or seek if we have __srefill() */
 #else
         _zz_addpos(fd, -1);
@@ -614 +659 @@
 {
     char *ret;
-#if defined HAVE___SREFILL /* Don't fuzz or seek if we have __srefill() */
+#if defined HAVE_REFILL_STDIO /* Don't fuzz or seek if we have __srefill() */
 #else
     struct fuzz *fuzz;
@@ -627 +672 @@
         return ORIG(fgetln)(stream, len);
 
-#if defined HAVE___SREFILL /* Don't fuzz or seek if we have __srefill() */
+#if defined HAVE_REFILL_STDIO /* Don't fuzz or seek if we have __srefill() */
     _zz_lock(fd);
     ret = ORIG(fgetln)(stream, len);
@@ -682 +727 @@
     if(ret != EOF)
     {
+        /* FIXME: do we have to fuzz ret, too, like in __filbuf? */
         if(newpos != -1)
             _zz_setpos(fd, newpos - fp->_r);
@@ -695 +741 @@
 #endif
 
+#if defined HAVE___FILBUF
+int NEW(__filbuf)(FILE *fp)
+{
+    off_t newpos;
+    int ret, fd;
+
+    LOADSYM(__filbuf);
+    fd = fileno(fp);
+    if(!_zz_ready || !_zz_iswatched(fd) || !_zz_isactive(fd))
+        return ORIG(__filbuf)(fp);
+
+    _zz_lock(fd);
+    ret = ORIG(__filbuf)(fp);
+    newpos = lseek(fd, 0, SEEK_CUR);
+    _zz_unlock(fd);
+    if(ret != EOF)
+    {
+        if(newpos != -1)
+            _zz_setpos(fd, newpos - fp->__cnt - 1);
+        _zz_fuzz(fd, fp->__ptr - 1, fp->__cnt + 1);
+        ret = (uint8_t)fp->__ptr[-1];
+        _zz_addpos(fd, fp->__cnt + 1);
+    }
+
+    if(!_zz_islocked(fd))
+        debug("%s([%i]) = %i", __func__, fd, ret);
+
+    return ret;
+}
+#endif
+