Changeset 2553Tweet

Timestamp:

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

Author:

Sam Hocevar

Message:

• lib-stream.c: try to make the filbuf() implementation portable across HP-UX and OpenSolaris?.

Location:

zzuf/trunk

Files:

• configure.ac (modified) (1 diff)
• src/lib-stream.c (modified) (2 diffs)

zzuf/trunk/configure.ac

@@ -68 +68 @@
 AC_DEFINE_UNQUOTED(RECV_T, $ac_v_recv_t, [Define to the recv() return type])
 
+AC_MSG_CHECKING(for FILE* internal members)
+ac_v_fp_cnt="unknown"
+ac_v_fp_ptr="unknown"
+AC_TRY_COMPILE([#include <stdio.h>],
+ [FILE *fp; fp->__cnt++; fp->__ptr++],
+ [ac_v_fp_cnt=__cnt; ac_v_fp_ptr=__ptr])
+AC_TRY_COMPILE([#include <stdio.h>],
+ [FILE *fp; fp->_cnt++; fp->_ptr++],
+ [ac_v_fp_cnt=_cnt; ac_v_fp_ptr=_ptr])
+AC_TRY_COMPILE([#include <stdio.h>],
+ [FILE *fp; fp->_c++; fp->_p++],
+ [ac_v_fp_cnt=_c; ac_v_fp_ptr=_p])
+AC_MSG_RESULT($ac_v_fp_cnt/$ac_v_fp_ptr)
+AC_DEFINE_UNQUOTED(FILE_CNT, $ac_v_fp_cnt, [Define to the FILE::cnt member name])
+AC_DEFINE_UNQUOTED(FILE_PTR, $ac_v_fp_ptr, [Define to the FILE::ptr member name])
+
 AC_MSG_CHECKING(for pragma INIT/FINI)
 AC_TRY_COMPILE([],

zzuf/trunk/src/lib-stream.c

@@ -145 +145 @@
 #if defined HAVE_REFILL_STDIO /* Fuzz fp if we have __srefill() */
 #   define FOPEN_FUZZ() \
-    _zz_fuzz(fd, ret->__ptr, ret->__cnt)
+    _zz_fuzz(fd, ret->FP_PTR, ret->FP_CNT)
 #else
 #   define FOPEN_FUZZ()
@@ -795 +795 @@
     {
         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);
+            _zz_setpos(fd, newpos - fp->FP_CNT - 1);
+        _zz_fuzz(fd, fp->FP_PTR - 1, fp->FP_CNT + 1);
+        ret = (uint8_t)fp->FP_PTR[-1];
+        _zz_addpos(fd, fp->FP_CNT + 1);
     }