Changeset 2570 for zzuf/trunk/srcTweet

Timestamp:

Jul 20, 2008, 3:22:46 AM (12 years ago)

Author:

Sam Hocevar

Message:

• lib-stream.c: the BSDs' refill function is slightly different from the HP-UX and Solaris ones; fixing our implementation accordinly.

File:

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

zzuf/trunk/src/lib-stream.c

@@ -756 +756 @@
 #endif
 
-#define REFILL(fn) \
+#define REFILL(fn, fn_advances) \
     do \
     { \
@@ -771 +771 @@
         if(ret != EOF) \
         { \
-            if(newpos != -1) \
-                _zz_setpos(fd, newpos - fp->FILE_CNT - 1); \
-            _zz_fuzz(fd, fp->FILE_PTR - 1, fp->FILE_CNT + 1); \
-            ret = (uint8_t)fp->FILE_PTR[-1]; \
-            _zz_addpos(fd, fp->FILE_CNT + 1); \
+            if(fn_advances) \
+            { \
+                if(newpos != -1) \
+                    _zz_setpos(fd, newpos - fp->FILE_CNT - 1); \
+                uint8_t ch = (uint8_t)(unsigned int)ret; \
+                _zz_fuzz(fd, &ch, 1); \
+                ret = ch; \
+                _zz_addpos(fd, 1); \
+            } \
+            else \
+                ret = ((uint8_t *)fp->FILE_PTR)[0]; \
+            _zz_fuzz(fd, fp->FILE_PTR, fp->FILE_CNT); \
+            _zz_addpos(fd, fp->FILE_CNT); \
         } \
         if(!_zz_islocked(fd)) \
@@ -785 +793 @@
 int NEW(__srefill)(FILE *fp)
 {
-    int ret; REFILL(__srefill); return ret;
+    int ret; REFILL(__srefill, 0); return ret;
 }
 #endif
@@ -792 +800 @@
 int NEW(__srget)(FILE *fp)
 {
-    int ret; REFILL(__srget); return ret;
+    int ret; REFILL(__srget, 1); return ret;
 }
 #endif
@@ -799 +807 @@
 int NEW(__filbuf)(FILE *fp)
 {
-    int ret; REFILL(__filbuf); return ret;
-}
-#endif
-
+    int ret; REFILL(__filbuf, 1); return ret;
+}
+#endif
+