X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=70e43ccf7af67f197d3fc36057a82d679f6d6e9e;hp=b603dee53e22a555b0f7b94c9dda7e3651c71ddf;hb=847bf71a4af4770390a59e8ef8e1fdfca33687b9;hpb=bbefb8dd3e1e198313e2eaf83f5451224ef8e27e

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index b603dee5..70e43ccf 100644
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -69,7 +69,8 @@ static void list_formats(FILE *fp)
 
 static void usage(FILE *fp)
 {
-	fprintf(fp, "Babeltrace %u.%u\n\n", BABELTRACE_VERSION_MAJOR,
+	fprintf(fp, "BabelTrace Trace Converter %u.%u\n\n",
+		BABELTRACE_VERSION_MAJOR,
 		BABELTRACE_VERSION_MINOR);
 	fprintf(fp, "usage : babeltrace [OPTIONS] INPUT OUTPUT\n");
 	fprintf(fp, "\n");
@@ -96,6 +97,11 @@ static int parse_options(int argc, char **argv)
 	poptContext pc;
 	int opt, ret = 0;
 
+	if (argc == 1) {
+		usage(stdout);
+		return 1;	/* exit cleanly */
+	}
+
 	pc = poptGetContext(NULL, argc, (const char **) argv, long_options, 0);
 	poptReadDefaultConfig(pc, 0);
 
@@ -201,11 +207,18 @@ int main(int argc, char **argv)
 		goto error_td_write;
 	}
 
+	ret = convert_trace(td_write, td_read);
+	if (ret) {
+		fprintf(stdout, "Error printing trace.\n\n");
+		goto error_copy_trace;
+	}
+
 	fmt_write->close_trace(td_write);
 	fmt_read->close_trace(td_read);
 	exit(EXIT_SUCCESS);
 
 	/* Error handling */
+error_copy_trace:
 	fmt_write->close_trace(td_write);
 error_td_write:
 	fmt_read->close_trace(td_read);