Changeset 4030 for zzuf/trunk/testTweet

Timestamp:

Nov 25, 2009, 1:42:17 AM (11 years ago)

Author:

Sam Hocevar

Message:

More zzcat stuff.

Location:

zzuf/trunk/test

Files:

• check-utils (modified) (1 diff)
• zzcat.c (modified) (5 diffs)

zzuf/trunk/test/check-utils

@@ -22 +22 @@
         fi
         for n in 100 101 102 \
-                 200 201 202 203 204 205 206 207 208 209 210 211 212 \
+                 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 \
                  300 301 302 303 304 305 306 307 308 309 310 311 \
-                 400 401 402 403 404 \
+                 400 401 402 403 404 405 406 407 \
                  500; do
             check "$ZZOPTS" "$ZZCAT $n $file" "zzcat $n"

zzuf/trunk/test/zzcat.c

@@ -39 +39 @@
 
 static int zzcat_read(char const *, unsigned char *, int64_t, int64_t);
-static int zzcat_fread(char const *, unsigned char *, int64_t);
+static int zzcat_fread(char const *, unsigned char *, int64_t, int64_t);
 static int zzcat_fread_fseek(char const *, unsigned char *, int64_t, int64_t);
+static int zzcat_fseek_fread(char const *, unsigned char *, int64_t, int64_t);
 #if defined HAVE_GETLINE
 static int zzcat_getline_getc(char const *, unsigned char *, int64_t, int);
@@ -109 +110 @@
         case 102: ret = zzcat_read(name, data, len, len); break;
         /* Simple stream calls */
-        case 200: ret = zzcat_fread(name, data, len); break;
-        case 201: ret = zzcat_fseek_getc(name, data, len, 0, 0); break;
-        case 202: ret = zzcat_fseek_getc(name, data, len, 0, 1); break;
-        case 203: ret = zzcat_fseek_getc(name, data, len, 2, 0); break;
-        case 204: ret = zzcat_fseek_getc(name, data, len, 2, 1); break;
-        case 205: ret = zzcat_fseek_getc(name, data, len, len / 2, 0); break;
-        case 206: ret = zzcat_fseek_getc(name, data, len, len / 2, 1); break;
-        case 207: ret = zzcat_fread_getc(name, data, len, 2, 0); break;
-        case 208: ret = zzcat_fread_getc(name, data, len, 2, 1); break;
-        case 209: ret = zzcat_fread_getc(name, data, len, len / 2, 0); break;
-        case 210: ret = zzcat_fread_getc(name, data, len, len / 2, 1); break;
+        case 200: ret = zzcat_fread(name, data, len, 1); break;
+        case 201: ret = zzcat_fread(name, data, len, 2); break;
+        case 202: ret = zzcat_fread(name, data, len, len); break;
+        case 203: ret = zzcat_fseek_getc(name, data, len, 0, 0); break;
+        case 204: ret = zzcat_fseek_getc(name, data, len, 0, 1); break;
+        case 205: ret = zzcat_fseek_getc(name, data, len, 2, 0); break;
+        case 206: ret = zzcat_fseek_getc(name, data, len, 2, 1); break;
+        case 207: ret = zzcat_fseek_getc(name, data, len, len / 2, 0); break;
+        case 208: ret = zzcat_fseek_getc(name, data, len, len / 2, 1); break;
+        case 209: ret = zzcat_fread_getc(name, data, len, 2, 0); break;
+        case 210: ret = zzcat_fread_getc(name, data, len, 2, 1); break;
+        case 211: ret = zzcat_fread_getc(name, data, len, len / 2, 0); break;
+        case 212: ret = zzcat_fread_getc(name, data, len, len / 2, 1); break;
 #if defined HAVE_GETLINE
-        case 211: ret = zzcat_getline_getc(name, data, len, 0); break;
-        case 212: ret = zzcat_getline_getc(name, data, len, 1); break;
+        case 213: ret = zzcat_getline_getc(name, data, len, 0); break;
+        case 214: ret = zzcat_getline_getc(name, data, len, 1); break;
 #endif
         /* Simple unlocked stream calls */
@@ -145 +148 @@
         case 401: ret = zzcat_fread_fseek(name, data, len, 2); break;
         case 402: ret = zzcat_fread_fseek(name, data, len, 4000); break;
-        case 403: ret = zzcat_random_socket(name, data, len); break;
-        case 404: ret = zzcat_random_stream(name, data, len); break;
+        case 403: ret = zzcat_fseek_fread(name, data, len, 1); break;
+        case 404: ret = zzcat_fseek_fread(name, data, len, 2); break;
+        case 405: ret = zzcat_fseek_fread(name, data, len, 4000); break;
+        case 406: ret = zzcat_random_socket(name, data, len); break;
+        case 407: ret = zzcat_random_stream(name, data, len); break;
         /* Misc */
 #if defined HAVE_MMAP
@@ -175 +181 @@
 
 /* Only fread() calls */
-static int zzcat_fread(char const *name, unsigned char *data, int64_t len)
-{
-    FILE *stream = fopen(name, "r");
-    int i;
-    if(!stream)
-        return EXIT_FAILURE;
-    for(i = 0; i < len; i++)
-        fread(data + i, 1, 1, stream);
+static int zzcat_fread(char const *name, unsigned char *data, int64_t len,
+                       int64_t chunk)
+{
+    FILE *stream = fopen(name, "r");
+    int i;
+    if(!stream)
+        return EXIT_FAILURE;
+    for(i = 0; i < len; i += chunk)
+        fread(data + i, chunk, 1, stream);
     fclose(stream);
     return EXIT_SUCCESS;
@@ -202 +209 @@
             break;
         fseek(stream, chunk, SEEK_CUR);
+        i += chunk;
+    }
+    fclose(stream);
+    return EXIT_SUCCESS;
+}
+
+/* Only fseek() and fread() calls */
+static int zzcat_fseek_fread(char const *name, unsigned char *data,
+                             int64_t len, int64_t chunk)
+{
+    FILE *stream = fopen(name, "r");
+    int i;
+    if(!stream)
+        return EXIT_FAILURE;
+    for(i = 0; i < len; )
+    {
+        fseek(stream, chunk, SEEK_CUR);
+        i += chunk;
+        if (i >= len)
+            break;
+        fread(data + i, chunk, 1, stream);
         i += chunk;
     }