Changeset 2332Tweet

Timestamp:

May 18, 2008, 11:45:48 AM (15 years ago)

Author:

Sam Hocevar

Message:

• Make sure the fgets_unlocked() reimplementation uses fgetc_unlocked(), not fgetc().

File:

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

zzuf/trunk/src/lib-stream.c

@@ -370 +370 @@
 
 #if defined HAVE___SREFILL /* Don't fuzz or seek if we have __srefill() */
-#   define FGETS_FUZZ \
+#   define FGETS_FUZZ(fn, fn2) \
         _zz_lock(fd); \
-        ret = ORIG(fgets)(s, size, stream); \
+        ret = ORIG(fn)(s, size, stream); \
         _zz_unlock(fd);
 #else
-#   define FGETS_FUZZ \
+#   define FGETS_FUZZ(fn, fn2) \
         if(size <= 0) \
             ret = NULL; \
@@ -387 +387 @@
                 int ch; \
                 _zz_lock(fd); \
-                ch = ORIG(fgetc)(stream); \
+                ch = ORIG(fn2)(stream); \
                 _zz_unlock(fd); \
                 if(ch == EOF) \
@@ -408 +408 @@
 #endif
 
-#define FGETS(fn) \
+#define FGETS(fn, fn2) \
     do \
     { \
@@ -414 +414 @@
         ret = s; \
         LOADSYM(fn); \
-        LOADSYM(fgetc); \
+        LOADSYM(fn2); \
         fd = fileno(stream); \
         if(!_zz_ready || !_zz_iswatched(fd) || !_zz_isactive(fd)) \
             return ORIG(fn)(s, size, stream); \
-        FGETS_FUZZ \
+        FGETS_FUZZ(fn, fn2) \
         debug("%s(%p, %i, [%i]) = %p", __func__, s, size, fd, ret); \
     } while(0)
@@ -424 +424 @@
 char *NEW(fgets)(char *s, int size, FILE *stream)
 {
-    char *ret; FGETS(fgets); return ret;
+    char *ret; FGETS(fgets, fgetc); return ret;
 }
 
@@ -430 +430 @@
 char *NEW(fgets_unlocked)(char *s, int size, FILE *stream)
 {
-    char *ret; FGETS(fgets_unlocked); return ret;
+    char *ret; FGETS(fgets_unlocked, fgetc_unlocked); return ret;
 }
 #endif