Changeset 4240 for zzuf/trunk/testTweet

Timestamp:

Jan 8, 2010, 1:48:33 AM (11 years ago)

Author:

Sam Hocevar

Message:

Implement feof(x) in zzcat, to break out of a loop after EOF was hit x times.

Location:

zzuf/trunk/test

Files:

• check-utils (modified) (3 diffs)
• zzcat.c (modified) (7 diffs)

zzuf/trunk/test/check-utils

@@ -57 +57 @@
         check "$ZZOPTS" "$ZZCAT \"fread(1,33000) fseek(1,SEEK_SET) fread(1,1) fseek(4093,SEEK_CUR) fread(1,1) fseek(1,SEEK_CUR) fread(1,1)\" $file" \
               "eglibc (2.9-21) bug regression"
-        check "$ZZOPTS" "$ZZCAT \"repeat(33000,getc_unlocked() ungetc() getline())\" $file" \
+        check "$ZZOPTS" "$ZZCAT \"repeat(33000,getc_unlocked() ungetc() getline() feof(10))\" $file" \
               "sed getc_unlocked() bug regression"
         # Misc tests
@@ -72 +72 @@
           "fgetc() ungetc() fread(1,33000)" \
           "fgetc_unlocked() ungetc() fread(1,33000)" \
-          "repeat(33000,getc())" \
-          "repeat(33000,getc_unlocked())" \
-          "repeat(33000,fgetc())" \
-          "repeat(33000,fgetc_unlocked())" \
+          "repeat(33000,getc(),feof(10))" \
+          "repeat(33000,getc_unlocked(),feof(10))" \
+          "repeat(33000,fgetc(),feof(10))" \
+          "repeat(33000,fgetc_unlocked(),feof(10))" \
           "repeat(8000,getc()) fread(1,33000)" \
           "repeat(8000,getc_unlocked()) fread(1,33000)" \
@@ -89 +89 @@
           "fread(1,33000) rewind() repeat(10000,fseek(3,SEEK_CUR) fread(1,3))" \
           "fread(1,33000) rewind() repeat(10000,fseek(4,SEEK_CUR) fread(1,4))" \
-          "repeat(33000,getc() ungetc() getline())" \
-          "repeat(33000,fgetc() ungetc() getline())" \
-          "fread(1,33000) fseek(1000,SEEK_CUR) repeat(10000,fread(1,2))" \
-          "fread(1,33000) fseek(1000,SEEK_CUR) repeat(10000,getc())" \
-          "fread(1,33000) fseek(1000,SEEK_CUR) repeat(10000,fgetc())" \
-          "fread(1,33000) fseek(1000,SEEK_CUR) repeat(10000,getc_unlocked())" \
+          "repeat(33000,getc() ungetc() getline() feof(10))" \
+          "repeat(33000,fgetc() ungetc() getline() feof(10))" \
+          "fread(1,33000) fseek(1000,SEEK_CUR) repeat(10000,fread(1,2),feof(10))" \
+          "fread(1,33000) fseek(1000,SEEK_CUR) repeat(10000,getc(),feof(10))" \
+          "fread(1,33000) fseek(1000,SEEK_CUR) repeat(10000,fgetc(),feof(10))" \
+          "fread(1,33000) fseek(1000,SEEK_CUR) repeat(10000,getc_unlocked(),feof(10))" \
           ; do
             check "$ZZOPTS" "$ZZCAT \"$n\" $file" "$n"

zzuf/trunk/test/zzcat.c

@@ -1 +1 @@
 /*
  *  zzcat - various cat reimplementations for testing purposes
- *  Copyright (c) 2006-2009 Sam Hocevar <sam@hocevar.net>
+ *  Copyright (c) 2006-2010 Sam Hocevar <sam@hocevar.net>
  *                All Rights Reserved
  *
@@ -105 +105 @@
     } while(0)
 
+#define FEOF() \
+    do { \
+        if (!f) \
+        { \
+            f = fopen(file, "r"); \
+            if (!f) \
+            { \
+                fprintf(stderr, "E: zzcat: cannot open `%s'\n", file); \
+                return EXIT_FAILURE; \
+            } \
+        } \
+        if (feof(f)) \
+            feofs++; \
+        if (feofs >= l1) \
+            finish = 1; \
+        p = strchr(p, ')') + 1; \
+    } while(0)
+
 /*
  * Command parser. We rewrite fmt by replacing the last character with
@@ -153 +171 @@
     FILE *f = NULL;
     size_t retlen = 0, retoff = 0;
-    int nloops = 0, fd = -1;
+    int nloops = 0, fd = -1, feofs = 0, finish = 0;
 
     /* Allocate 32MB for our temporary buffer. Any larger value will crash. */
@@ -188 +206 @@
             }
             loops[nloops - 1].count--;
-            if (loops[nloops - 1].count <= 0)
+            if (loops[nloops - 1].count <= 0 || finish)
             {
                 nloops--;
@@ -197 +215 @@
                 p = loops[nloops - 1].p;
             }
+
+            finish = 0;
         }
 
@@ -220 +240 @@
             FOPEN(f = __freopen64(file, "r", f));
 #endif
+
+        /* FILE * EOF detection */
+        else if (PARSECMD("feof ( %li )", &l1))
+            FEOF();
 
         /* FILE * closing functions */
@@ -334 +358 @@
         if (lineptr)
             free(lineptr);
+
+        if (finish && !nloops)
+            break;
     }