X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace.c;h=e4efea29707afa304a8ead31a1395f9af4a24cbb;hp=ce7664a834d7ddeb1ce01ac3677e7635e1ad7d26;hb=64fa3fec6c28f1d077812b4bfa06ae73b0f5999d;hpb=d2b8ea6b81979dd25a8bab77c629499b988d7bae

diff --git a/converter/babeltrace.c b/converter/babeltrace.c
index ce7664a8..e4efea29 100644
--- a/converter/babeltrace.c
+++ b/converter/babeltrace.c
@@ -3,7 +3,9 @@
  *
  * Babeltrace Trace Converter
  *
- * Copyright 2010 - 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
@@ -33,6 +35,7 @@ static const char *opt_input_path;
 static const char *opt_output_path;
 
 int babeltrace_verbose, babeltrace_debug;
+int opt_field_names;
 
 void strlower(char *str)
 {
@@ -48,6 +51,7 @@ enum {
 	OPT_LIST,
 	OPT_VERBOSE,
 	OPT_DEBUG,
+	OPT_NAMES,
 };
 
 static struct poptOption long_options[] = {
@@ -58,6 +62,7 @@ static struct poptOption long_options[] = {
 	{ "list", 'l', POPT_ARG_NONE, NULL, OPT_LIST, NULL, NULL },
 	{ "verbose", 'v', POPT_ARG_NONE, NULL, OPT_VERBOSE, NULL, NULL },
 	{ "debug", 'd', POPT_ARG_NONE, NULL, OPT_DEBUG, NULL, NULL },
+	{ "names", 'n', POPT_ARG_NONE, NULL, OPT_NAMES, NULL, NULL },
 	{ NULL, 0, 0, NULL, 0, NULL, NULL },
 };
 
@@ -84,6 +89,7 @@ static void usage(FILE *fp)
 	fprintf(fp, "  -l, --list                     List available formats\n");
 	fprintf(fp, "  -v, --verbose                  Verbose mode\n");
 	fprintf(fp, "  -d, --debug                    Debug mode\n");
+	fprintf(fp, "  -n, --names                    Print field names\n");
 	list_formats(fp);
 	fprintf(fp, "\n");
 }
@@ -121,6 +127,9 @@ static int parse_options(int argc, char **argv)
 		case OPT_DEBUG:
 			babeltrace_debug = 1;
 			break;
+		case OPT_NAMES:
+			opt_field_names = 1;
+			break;
 		default:
 			ret = -EINVAL;
 			goto end;
@@ -196,7 +205,7 @@ int main(int argc, char **argv)
 		goto error_td_read;
 	}
 
-	td_write = fmt_write->open_trace(opt_output_path, O_WRONLY);
+	td_write = fmt_write->open_trace(opt_output_path, O_RDWR);
 	if (!td_write) {
 		fprintf(stdout, "Error opening trace \"%s\" for writing.\n\n",
 			opt_output_path ? : "<none>");