Changeset 4315572b for lib

Timestamp:

04/23/06 14:11:01 (16 years ago)

Author:

Perry Lorier <perry@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

698a217

Parents:

e337363

Message:

Fixup stdio to be more standard compliant
Fix format wag to be more sensitive to errors

Location:

lib

Files:

• format_wag.c (modified) (2 diffs)
• libtraceio-stdio.c (modified) (2 diffs)

lib/format_wag.c

@@ -298 +298 @@
         buffer2 = buffer = packet->buffer;
 
-        
-        if ((numbytes = libtrace_io_read(INPUT.file, buffer, sizeof(struct frame_t))) == -1) {
+        numbytes = libtrace_io_read(INPUT.file, buffer, sizeof(struct frame_t));
+
+        if (numbytes == 0) {
+                return 0;
+        }
+
+        if (numbytes != sizeof(struct frame_t)) {
                 int err=errno;
                 trace_set_err(libtrace,err,
@@ -307 +312 @@
         }
 
-        if (numbytes == 0) {
-                return 0;
-        }
-
         if (htons(((struct frame_t *)buffer)->magic) != 0xdaa1) {
                 trace_set_err(libtrace,
-                                TRACE_ERR_BAD_PACKET,"Insufficient magic");
+                                TRACE_ERR_BAD_PACKET,"Insufficient magic (%04x)",htons(((struct frame_t *)buffer)->magic));
                 return -1;
         }

lib/libtraceio-stdio.c

@@ -4 +4 @@
 #include <sys/types.h> /* for ssize_t/off_t */
 #include <stdio.h>
+#include <stdlib.h>
+
+#include <errno.h> /* for debugging */
 
 struct libtrace_io_t {
@@ -11 +14 @@
 ssize_t libtrace_io_read(libtrace_io_t *io, void *buf, size_t len)
 {
-        return fread(buf,len,1,io->file);
+        int ret=fread(buf,1,len,io->file);
+
+        if (ret==(int)len) {
+                printf("read %i bytes\n",ret);
+                return len;
+        }
+
+        /* EOF or an Error occurred */
+        if (ferror(io->file)) {
+                int err=errno;
+                perror("fread");
+                errno=err;
+                /* errno will be set */
+                return -1;
+        }
+
+        printf("eof\n");
+
+        return 0; /* EOF */
 }