Changeset 1355 for libcaca/trunk/srcTweet

Timestamp:

Nov 12, 2006, 11:06:35 AM (14 years ago)

Author:

Sam Hocevar

Message:

• Properly handle EOF in cacaplay.

File:

• libcaca/trunk/src/cacaplay.c (modified) (3 diffs)

libcaca/trunk/src/cacaplay.c

@@ -33 +33 @@
     caca_display_t *dp;
     unsigned char *buf = NULL;
-    long int bytes, total = 0;
+    long int bytes = 0, total = 0;
     int fd;
 
@@ -59 +59 @@
         caca_event_t ev;
         int ret = caca_get_event(dp, CACA_EVENT_ANY, &ev, 0);
+        int eof = 0;
 
         if(ret && ev.type & CACA_EVENT_KEY_PRESS)
             break;
+
+        if(bytes == 0)
+        {
+            ssize_t n;
+            buf = realloc(buf, total + 1);
+            n = read(fd, buf + total, 1);
+            if(n < 0)
+            {
+                fprintf(stderr, "%s: read error\n", argv[0]);
+                return -1;
+            }
+            else if(n == 0)
+            {
+                eof = 1;
+            }
+            total += n;
+        }
 
         bytes = cucul_import_memory(app, buf, total, "caca");
@@ -73 +91 @@
             caca_refresh_display(dp);
         }
-        else if(bytes == 0)
-        {
-            ssize_t n;
-            buf = realloc(buf, total + 128);
-            n = read(fd, buf + total, 128);
-            if(n < 0)
-            {
-                fprintf(stderr, "%s: read error\n", argv[0]);
-                return -1;
-            }
-            total += n;
-        }
-        else /* bytes < 0 */
+        else if(bytes < 0)
         {
             fprintf(stderr, "%s: corrupted caca file\n", argv[0]);
-            return -1;
+            break;
         }
+
+        if(eof)
+            break;
     }
+
+    caca_get_event(dp, CACA_EVENT_KEY_PRESS, NULL, -1);
 
     /* Clean up */