Changeset 2584 for zzuf/trunk/src/lib-stream.cTweet

Timestamp:

Jul 24, 2008, 1:40:13 AM (15 years ago)

Author:

Sam Hocevar

Message:

• Hack around to get HP-UX tools to work. It still fails the most nasty zzcat test, though. But a more massive redesign is probably necessary.

File:

• zzuf/trunk/src/lib-stream.c (modified) (11 diffs)

zzuf/trunk/src/lib-stream.c

@@ -359 +359 @@
 }
 
+#if defined HAVE___FILBUF || defined HAVE___SRGET
+#   define FREAD_PREFUZZ() \
+    do \
+    { \
+        int64_t tmp = _zz_getpos(fd); \
+        _zz_setpos(fd, pos); \
+        already_fuzzed = _zz_getfuzzed(fd); \
+        _zz_setpos(fd, tmp); \
+    } \
+    while(0)
+#else
+#   define FREAD_PREFUZZ() do {} while(0)
+#endif
+
 #if defined REFILL_ONLY_STDIO /* Don't fuzz or seek if we have __srefill() */
 #   define FREAD_FUZZ() \
@@ -383 +397 @@
         { \
             char *b = ptr; \
-            _zz_setpos(fd, pos); \
-            _zz_fuzz(fd, ptr, newpos - pos); \
+            /* Skip bytes that were already fuzzed by __filbuf or __srget */ \
+            if(newpos > pos + already_fuzzed) \
+            { \
+                _zz_setpos(fd, pos + already_fuzzed); \
+                _zz_fuzz(fd, ptr, newpos - pos - already_fuzzed); \
+            } \
             _zz_setpos(fd, newpos); \
             if(newpos >= pos + 4) \
@@ -405 +423 @@
     { \
         int64_t pos; \
-        int fd; \
+        int fd, already_fuzzed = 0; \
         LOADSYM(fn); \
         fd = fileno(stream); \
@@ -414 +432 @@
         ret = ORIG(fn)(ptr, size, nmemb, stream); \
         _zz_unlock(fd); \
+        FREAD_PREFUZZ(); \
         FREAD_FUZZ(); \
     } while(0)
@@ -430 +449 @@
 #endif
 
+#if defined HAVE___FILBUF || defined HAVE___SRGET
+#   define FGETC_PREFUZZ already_fuzzed = _zz_getfuzzed(fd);
+#else
+#   define FGETC_PREFUZZ
+#endif
+
 #if defined REFILL_ONLY_STDIO /* Don't fuzz or seek if we have __srefill() */
 #   define FGETC_FUZZ
@@ -437 +462 @@
         { \
             uint8_t ch = ret; \
-            _zz_fuzz(fd, &ch, 1); \
+            if(already_fuzzed <= 0) \
+               _zz_fuzz(fd, &ch, 1); \
             _zz_addpos(fd, 1); \
             ret = ch; \
@@ -445 +471 @@
 #define FGETC(fn, s, arg) \
     do { \
-        int fd; \
+        int fd, already_fuzzed = 0; \
         LOADSYM(fn); \
         fd = fileno(s); \
@@ -453 +479 @@
         ret = ORIG(fn)(arg); \
         _zz_unlock(fd); \
+        FGETC_PREFUZZ \
         FGETC_FUZZ \
         if(ret == EOF) \
@@ -759 +786 @@
     do \
     { \
+        int64_t pos; \
         off_t newpos; \
         int fd; \
@@ -765 +793 @@
         if(!_zz_ready || !_zz_iswatched(fd) || !_zz_isactive(fd)) \
             return ORIG(fn)(fp); \
+        pos = _zz_getpos(fd); \
         _zz_lock(fd); \
         ret = ORIG(fn)(fp); \
@@ -771 +800 @@
         if(ret != EOF) \
         { \
+            int already_fuzzed = 0; \
             if(fn_advances) \
             { \
+                uint8_t ch = (uint8_t)(unsigned int)ret; \
                 if(newpos != -1) \
                     _zz_setpos(fd, newpos - fp->FILE_CNT - 1); \
-                uint8_t ch = (uint8_t)(unsigned int)ret; \
+                already_fuzzed = _zz_getfuzzed(fd); \
                 _zz_fuzz(fd, &ch, 1); \
-                ret = ch; \
+                ret = fp->FILE_PTR[-1] = ch; \
+                _zz_setfuzzed(fd, fp->FILE_CNT + 1); \
                 _zz_addpos(fd, 1); \
             } \
             else \
             { \
+                _zz_setfuzzed(fd, fp->FILE_CNT); \
                 if(newpos != -1) \
                     _zz_setpos(fd, newpos - fp->FILE_CNT); \
             } \
-            _zz_fuzz(fd, fp->FILE_PTR, fp->FILE_CNT); \
-            _zz_addpos(fd, fp->FILE_CNT); \
+            if(fp->FILE_CNT > already_fuzzed) \
+            { \
+                _zz_addpos(fd, already_fuzzed); \
+                _zz_fuzz(fd, fp->FILE_PTR, fp->FILE_CNT - already_fuzzed); \
+            } \
+            _zz_addpos(fd, fp->FILE_CNT - already_fuzzed); \
         } \
-        if(!_zz_islocked(fd)) \
-            debug("%s([%i]) = %i", __func__, fd, ret); \
+        _zz_setpos(fd, pos); /* FIXME: do we always need to do this? */ \
+        debug("%s([%i]) = %i", __func__, fd, ret); \
     } \
     while(0)