Changeset 1719 for zzuf/trunkTweet

Timestamp:

Jan 27, 2007, 4:13:34 PM (13 years ago)

Author:

Sam Hocevar

Message:

• Better ungetc() implementation. Now we don't need to care about the fuzzing method.

Location:

zzuf/trunk/src

Files:

• fd.c (modified) (1 diff)
• fuzz.c (modified) (2 diffs)
• lib-stream.c (modified) (2 diffs)
• libzzuf.h (modified) (1 diff)

zzuf/trunk/src/fd.c

@@ -257 +257 @@
     files[i].fuzz.tmp = NULL;
 #endif
+    files[i].fuzz.uflag = 0;
 
     if(autoinc)

zzuf/trunk/src/fuzz.c

@@ -153 +153 @@
                     goto range_ok;
 
-            continue; /* Not in a range */
+            continue; /* Not in one of the ranges, skip byte */
 
         range_ok:
@@ -168 +168 @@
             aligned_buf[j] = byte;
         }
+    }
+
+    /* Handle ungetc() */
+    if(fuzz->uflag)
+    {
+        fuzz->uflag = 0;
+        if(fuzz->upos == pos)
+            buf[0] = fuzz->uchar;
     }
 }

zzuf/trunk/src/lib-stream.c

@@ -379 +379 @@
 int NEW(ungetc)(int c, FILE *stream)
 {
-    unsigned char ch = c;
     int ret, fd;
 
@@ -387 +386 @@
         return ORIG(ungetc)(c, stream);
 
-#if defined HAVE___SREFILL /* Don't fuzz or seek if we have __srefill() */
-#else
-    _zz_addpos(fd, -1);
-    _zz_fuzz(fd, &ch, 1);
-#endif
-    _zz_lock(fd);
-    ret = ORIG(ungetc)((int)ch, stream);
-    _zz_unlock(fd);
-
-    if(ret >= 0)
-        ret = c;
-#if defined HAVE___SREFILL /* Don't fuzz or seek if we have __srefill() */
-#else
-    else
-        _zz_addpos(fd, 1); /* revert what we did */
-#endif
+    _zz_lock(fd);
+    ret = ORIG(ungetc)(c, stream);
+    _zz_unlock(fd);
+
+    if(ret != EOF)
+    {
+        struct fuzz *fuzz = _zz_getfuzz(fd);
+        fuzz->uflag = 1;
+        fuzz->upos = _zz_getpos(fd) - 1;
+        fuzz->uchar = c;
+#if defined HAVE___SREFILL /* Don't fuzz or seek if we have __srefill() */
+#else
+        _zz_addpos(fd, -1);
+#endif
+    }
 
     debug("%s(0x%02x, [%i]) = '%c'", __func__, c, fd, ret);

zzuf/trunk/src/libzzuf.h

@@ -39 +39 @@
     char *tmp;
 #endif
+    int uflag; uint64_t upos; uint8_t uchar; /* ungetc stuff */
     uint8_t data[CHUNKBYTES];
 };