X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=7120207ddb5a47dafeb50089b13f1c542563ea7e;hp=28be4fd0cad21357a105f9c4a6984fd7e86f5b7f;hb=7eda6fc7537f70a15af83ad11cc3a8c549052028;hpb=5e2eb0aebe6dd62c86d2b96030cb1ba3a0793bec

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index 28be4fd0..7120207d 100644
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -3,7 +3,9 @@
  *
  * Format registration.
  *
- * Copyright 2010, 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -413,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;
 		}
@@ -456,12 +458,13 @@ 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;
@@ -473,7 +476,7 @@ int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in,
 {
 	struct metadata_packet_header header;
 	size_t readlen, writelen, toread;
-	char buf[4096];
+	char buf[4096 + 1];	/* + 1 for debug-mode \0 */
 	int ret = 0;
 
 	readlen = fread(&header, header_sizeof(header), 1, in);
@@ -514,12 +517,13 @@ int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in,
 	toread = (header.content_size / CHAR_BIT) - header_sizeof(header);
 
 	for (;;) {
-		readlen = fread(buf, sizeof(char), min(sizeof(buf), toread), in);
+		readlen = fread(buf, sizeof(char), min(sizeof(buf) - 1, toread), in);
 		if (ferror(in)) {
 			ret = -EINVAL;
 			break;
 		}
 		if (babeltrace_debug) {
+			buf[readlen] = '\0';
 			fprintf(stdout, "[debug] metadata packet read: %s\n",
 				buf);
 		}
@@ -608,6 +612,18 @@ int ctf_open_trace_metadata_read(struct ctf_trace *td)
 		ret = ctf_open_trace_metadata_stream_read(td, &fp, &buf);
 		if (ret)
 			goto end_packet_read;
+	} else {
+		char buf[sizeof("/* TSDL")];	/* Includes \0 */
+		ssize_t readlen;
+
+		td->byte_order = BYTE_ORDER;
+
+		/* Check text-only metadata header */
+		buf[sizeof("/* TSDL") - 1] = '\0';
+		readlen = fread(buf, sizeof("/* TSDL") - 1, 1, fp);
+		if (readlen < 1 || strcmp(buf, "/* TSDL") != 0)
+			fprintf(stdout, "[warning] Missing \"/* TSDL\" header for text-only metadata.\n");
+		rewind(fp);
 	}
 
 	scanner = ctf_scanner_alloc(fp);
@@ -636,7 +652,7 @@ int ctf_open_trace_metadata_read(struct ctf_trace *td)
 		goto end;
 	}
 	ret = ctf_visitor_construct_metadata(stdout, 0, &scanner->ast->root,
-			td, BYTE_ORDER);
+			td, td->byte_order);
 	if (ret) {
 		fprintf(stdout, "[error] Error in CTF metadata constructor %d\n", ret);
 		goto end;
@@ -905,13 +921,12 @@ int create_stream_packet_index(struct ctf_trace *td,
 				return -EINVAL;
 			}
 			file_stream->parent.stream_class = stream;
+			ret = create_stream_definitions(td, &file_stream->parent);
+			if (ret)
+				return ret;
 		}
 		first_packet = 0;
 
-		ret = create_stream_definitions(td, &file_stream->parent);
-		if (ret)
-			return ret;
-
 		if (file_stream->parent.stream_packet_context) {
 			/* Read packet context */
 			ret = generic_rw(&pos->parent, &file_stream->parent.stream_packet_context->p);