X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=cli%2Fbabeltrace-cfg-cli-args.c;h=3af66edf2274a76e0fe66a053f43a90d21e91491;hb=b6a0d2d9bd21345c993fe7d1c9dee5ec17d15b0c;hp=c157063429482e2dd4070c12699674e41df7a1ab;hpb=8e765000096c548a4f65aaddb801a89350ec1001;p=babeltrace.git

diff --git a/cli/babeltrace-cfg-cli-args.c b/cli/babeltrace-cfg-cli-args.c
index c1570634..3af66edf 100644
--- a/cli/babeltrace-cfg-cli-args.c
+++ b/cli/babeltrace-cfg-cli-args.c
@@ -41,6 +41,7 @@
 #include "babeltrace-cfg.h"
 #include "babeltrace-cfg-cli-args.h"
 #include "babeltrace-cfg-cli-args-connect.h"
+#include "version.h"
 
 /*
  * Error printf() macro which prepends "Error: " the first time it's
@@ -729,7 +730,11 @@ end:
 static
 void print_version(void)
 {
-	puts("Babeltrace " VERSION);
+	if (GIT_VERSION[0] == '\0') {
+		puts("Babeltrace " VERSION);
+	} else {
+		puts("Babeltrace " VERSION  " - " GIT_VERSION);
+	}
 }
 
 /*
@@ -909,6 +914,9 @@ void bt_config_destroy(struct bt_object *obj)
 		if (cfg->cmd_data.print_ctf_metadata.path) {
 			g_string_free(cfg->cmd_data.print_ctf_metadata.path,
 				TRUE);
+			g_string_free(
+				cfg->cmd_data.print_ctf_metadata.output_path,
+				TRUE);
 		}
 		break;
 	case BT_CONFIG_COMMAND_PRINT_LTTNG_LIVE_SESSIONS:
@@ -916,6 +924,9 @@ void bt_config_destroy(struct bt_object *obj)
 			g_string_free(
 				cfg->cmd_data.print_lttng_live_sessions.url,
 				TRUE);
+			g_string_free(
+				cfg->cmd_data.print_lttng_live_sessions.output_path,
+				TRUE);
 		}
 		break;
 	default:
@@ -1659,6 +1670,12 @@ struct bt_config *bt_config_print_ctf_metadata_create(
 		goto error;
 	}
 
+	cfg->cmd_data.print_ctf_metadata.output_path = g_string_new(NULL);
+	if (!cfg->cmd_data.print_ctf_metadata.output_path) {
+		print_err_oom();
+		goto error;
+	}
+
 	goto end;
 
 error:
@@ -1687,6 +1704,13 @@ struct bt_config *bt_config_print_lttng_live_sessions_create(
 		goto error;
 	}
 
+	cfg->cmd_data.print_lttng_live_sessions.output_path =
+		g_string_new(NULL);
+	if (!cfg->cmd_data.print_lttng_live_sessions.output_path) {
+		print_err_oom();
+		goto error;
+	}
+
 	goto end;
 
 error:
@@ -2355,7 +2379,7 @@ struct bt_config *bt_config_run_from_args(int argc, const char *argv[],
 	struct bt_value *connection_args = NULL;
 	GString *cur_param_key = NULL;
 	char error_buf[256] = { 0 };
-	long long retry_duration = -1;
+	long retry_duration = -1;
 	struct poptOption run_long_options[] = {
 		{ "base-params", 'b', POPT_ARG_STRING, NULL, OPT_BASE_PARAMS, NULL, NULL },
 		{ "component", 'c', POPT_ARG_STRING, NULL, OPT_COMPONENT, NULL, NULL },
@@ -2368,7 +2392,7 @@ struct bt_config *bt_config_run_from_args(int argc, const char *argv[],
 		{ "params", 'p', POPT_ARG_STRING, NULL, OPT_PARAMS, NULL, NULL },
 		{ "plugin-path", '\0', POPT_ARG_STRING, NULL, OPT_PLUGIN_PATH, NULL, NULL },
 		{ "reset-base-params", 'r', POPT_ARG_NONE, NULL, OPT_RESET_BASE_PARAMS, NULL, NULL },
-		{ "retry-duration", '\0', POPT_ARG_LONGLONG, &retry_duration, OPT_RETRY_DURATION, NULL, NULL },
+		{ "retry-duration", '\0', POPT_ARG_LONG, &retry_duration, OPT_RETRY_DURATION, NULL, NULL },
 		{ "value", '\0', POPT_ARG_STRING, NULL, OPT_VALUE, NULL, NULL },
 		{ NULL, 0, '\0', NULL, 0, NULL, NULL },
 	};
@@ -2585,7 +2609,7 @@ struct bt_config *bt_config_run_from_args(int argc, const char *argv[],
 			break;
 		case OPT_RETRY_DURATION:
 			if (retry_duration < 0) {
-				printf_err("--retry-duration option's argument must be positive or 0: %lld\n",
+				printf_err("--retry-duration option's argument must be positive or 0: %ld\n",
 					retry_duration);
 				goto error;
 			}
@@ -4104,7 +4128,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 		case OPT_DEBUG_INFO_DIR:
 			implicit_debug_info_args.exists = true;
 			ret = append_implicit_component_extra_param(
-				&implicit_debug_info_args, "dir", arg);
+				&implicit_debug_info_args, "debug-info-dir", arg);
 			if (ret) {
 				goto error;
 			}
@@ -4319,6 +4343,13 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 		gs_leftover = leftovers->data;
 		g_string_assign(cfg->cmd_data.print_ctf_metadata.path,
 			gs_leftover->str);
+
+		if (output) {
+			g_string_assign(
+				cfg->cmd_data.print_ctf_metadata.output_path,
+				output);
+		}
+
 		goto end;
 	}
 
@@ -4406,6 +4437,13 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 
 				g_string_assign(cfg->cmd_data.print_lttng_live_sessions.url,
 					gs_leftover->str);
+
+				if (output) {
+					g_string_assign(
+						cfg->cmd_data.print_lttng_live_sessions.output_path,
+						output);
+				}
+
 				goto end;
 			}