Changeset 1567 for zzufTweet

Timestamp:

Jan 5, 2007, 5:03:04 PM (14 years ago)

Author:

Sam Hocevar

Message:

• Fix fgetln(). The testsuite *almost* passes.

File:

• zzuf/trunk/src/load-stream.c (modified) (3 diffs)

zzuf/trunk/src/load-stream.c

@@ -396 +396 @@
 {
     struct fuzz *fuzz;
-    char *ret;
     size_t i, size;
     int fd;
@@ -408 +407 @@
     fuzz = _zz_getfuzz(fd);
 
-    for(i = size = 0; fuzz.tmp[i] != '\n'; i++)
+    for(i = size = 0; ; i++)
     {
         int ch;
-
-        if(i >= size)
-            fuzz.tmp = realloc(fuzz.tmp, (size += 80));
 
         _zz_disabled = 1;
@@ -422 +418 @@
             break;
 
-        fuzz.tmp[i] = (char)(unsigned char)ch;
-        _zz_fuzz(fd, (uint8_t *)fuzz.tmp + i, 1); /* rather inefficient */
+        if(i >= size)
+            fuzz->tmp = realloc(fuzz->tmp, (size += 80));
+
+        fuzz->tmp[i] = (char)(unsigned char)ch;
+        _zz_fuzz(fd, (uint8_t *)fuzz->tmp + i, 1); /* rather inefficient */
         _zz_addpos(fd, 1);
+
+        if(ch == '\n')
+            break;
     }
 
-    *len = size;
-
-    debug("fgetln([%i], &%li) = %p", fd, (long int)*len, ret);
-    return ret;
-}
-#endif
-
+    *len = i;
+
+    debug("fgetln([%i], &%li) = %p", fd, (long int)*len, fuzz->tmp);
+    return fuzz->tmp;
+}
+#endif
+