Update message

[babeltrace.git] / formats / ctf / ctf.c

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index 4043055824b5e24fe253a7835ce9cc95fd989ab1..fee9a5578d809de68f233c2b855980a6f1fb0173 100644 (file)
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -415,9 +415,9 @@ void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence)
                file_stream->parent.timestamp = index->timestamp_begin;
                pos->content_size = index->content_size;
                pos->packet_size = index->packet_size;
-               if (index->data_offset < index->content_size)
+               if (index->data_offset <= index->content_size) {
                        pos->offset = 0;        /* will read headers */
-               else {
+               } else {
                        pos->offset = EOF;
                        return;
                }
@@ -458,17 +458,44 @@ int packet_metadata(struct ctf_trace *td, FILE *fp)
        if (magic == TSDL_MAGIC) {
                ret = 1;
                td->byte_order = BYTE_ORDER;
+               CTF_TRACE_SET_FIELD(td, byte_order);
        } else if (magic == GUINT32_SWAP_LE_BE(TSDL_MAGIC)) {
                ret = 1;
                td->byte_order = (BYTE_ORDER == BIG_ENDIAN) ?
                                        LITTLE_ENDIAN : BIG_ENDIAN;
+               CTF_TRACE_SET_FIELD(td, byte_order);
        }
-       CTF_TRACE_SET_FIELD(td, byte_order);
 end:
        rewind(fp);
        return ret;
 }
 
+/*
+ * Returns 0 on success, -1 on error.
+ */
+static
+int check_version(unsigned int major, unsigned int minor)
+{
+       switch (major) {
+       case 1:
+               switch (minor) {
+               case 8:
+                       return 0;
+               default:
+                       goto warning;
+               }
+       default:
+               goto warning;
+               
+       }
+
+       /* eventually return an error instead of warning */
+warning:
+       fprintf(stdout, "[warning] Unsupported CTF specification version %u.%u. Trying anyway.\n",
+               major, minor);
+       return 0;
+}
+
 static
 int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in,
                                        FILE *out)
@@ -505,6 +532,8 @@ int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in,
                        header.checksum_scheme);
                return -EINVAL;
        }
+       if (check_version(header.major, header.minor) < 0)
+               return -EINVAL;
        if (!CTF_TRACE_FIELD_IS_SET(td, uuid)) {
                memcpy(td->uuid, header.uuid, sizeof(header.uuid));
                CTF_TRACE_SET_FIELD(td, uuid);
@@ -607,11 +636,25 @@ int ctf_open_trace_metadata_read(struct ctf_trace *td)
                goto end_stream;
        }
 
-       td->byte_order = BYTE_ORDER;
        if (packet_metadata(td, fp)) {
                ret = ctf_open_trace_metadata_stream_read(td, &fp, &buf);
                if (ret)
                        goto end_packet_read;
+       } else {
+               unsigned int major, minor;
+               ssize_t nr_items;
+
+               td->byte_order = BYTE_ORDER;
+
+               /* Check text-only metadata header and version */
+               nr_items = fscanf(fp, "/* CTF %u.%u", &major, &minor);
+               if (nr_items < 2)
+                       fprintf(stdout, "[warning] Ill-shapen or missing \"/* CTF x.y\" header for text-only metadata.\n");
+               if (check_version(major, minor) < 0) {
+                       ret = -EINVAL;
+                       goto end_packet_read;
+               }
+               rewind(fp);
        }
 
        scanner = ctf_scanner_alloc(fp);