X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace-log.c;h=dfcfde71c9697b3a74341969d59e057219eb5ea4;hp=19cf3692a795ded50d645b7d5934788aaeb0412f;hb=39592eae8e476dbb016e2b09ef75f4a7b8cc151d;hpb=b4c19c1e0a905f94146e6f319218fb16b7ebbca1

diff --git a/converter/babeltrace-log.c b/converter/babeltrace-log.c
index 19cf3692..dfcfde71 100644
--- a/converter/babeltrace-log.c
+++ b/converter/babeltrace-log.c
@@ -45,6 +45,7 @@ int babeltrace_debug, babeltrace_verbose;
 
 static char *s_outputname;
 static int s_timestamp;
+static int s_help;
 static uuid_t s_uuid;
 
 /* Metadata format string */
@@ -264,6 +265,11 @@ int parse_args(int argc, char **argv)
 	for (i = 1; i < argc; i++) {
 		if (!strcmp(argv[i], "-t"))
 			s_timestamp = 1;
+		else if (!strcmp(argv[i], "-h")) {
+			s_help = 1;
+			return 0;
+		} else if (argv[i][0] == '-')
+			return -EINVAL;
 		else
 			s_outputname = argv[i];
 	}
@@ -281,10 +287,16 @@ int main(int argc, char **argv)
 
 	ret = parse_args(argc, argv);
 	if (ret) {
+		fprintf(stdout, "Error: invalid argument.\n");
 		usage(stdout);
 		goto error;
 	}
 
+	if (s_help) {
+		usage(stdout);
+		exit(EXIT_SUCCESS);
+	}
+
 	ret = mkdir(s_outputname, S_IRWXU|S_IRWXG);
 	if (ret) {
 		perror("mkdir");