X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcli%2Fbabeltrace2-cfg-cli-args.c;h=38a6650223aa6db8d754be04dcf7d3306dd29526;hb=v1.2.0-3402-g836e3fd0d;hp=381fc484e48c1696b5e613778c317ed0920acc52;hpb=d7ec6b8ae0dc2b06d1c57f449d7303cc65c68938;p=babeltrace.git

diff --git a/src/cli/babeltrace2-cfg-cli-args.c b/src/cli/babeltrace2-cfg-cli-args.c
index 381fc484..38a66502 100644
--- a/src/cli/babeltrace2-cfg-cli-args.c
+++ b/src/cli/babeltrace2-cfg-cli-args.c
@@ -191,16 +191,96 @@ end:
 	return;
 }
 
+static
+void print_and_indent(const char *str)
+{
+	const char *ch = &str[0];
+
+	for (; *ch != '\0'; ch++) {
+		if (*ch == '\n') {
+			if (ch[1] != '\0') {
+				printf("\n  ");
+			}
+		} else {
+			printf("%c", *ch);
+		}
+	}
+
+	printf("\n");
+}
+
 /*
  * Prints the Babeltrace version.
  */
 static
 void print_version(void)
 {
-	if (GIT_VERSION[0] == '\0') {
-		puts("Babeltrace " VERSION);
-	} else {
-		puts("Babeltrace " VERSION  " - " GIT_VERSION);
+	bool has_extra_name = strlen(BT_VERSION_EXTRA_NAME) > 0;
+	bool has_extra_description = strlen(BT_VERSION_EXTRA_DESCRIPTION) > 0;
+	bool has_extra_patch_names = strlen(BT_VERSION_EXTRA_PATCHES) > 0;
+	bool has_extra = has_extra_name || has_extra_description ||
+		has_extra_patch_names;
+
+	printf("%sBabeltrace %s%s",
+		bt_common_color_bold(),
+		VERSION,
+		bt_common_color_reset());
+
+	if (strlen(BT_VERSION_NAME) > 0) {
+		printf(" \"%s%s%s%s\"",
+			bt_common_color_fg_bright_blue(),
+			bt_common_color_bold(),
+			BT_VERSION_NAME,
+			bt_common_color_reset());
+	}
+
+	if (strlen(BT_VERSION_GIT) > 0) {
+		printf(" [%s%s%s]",
+			bt_common_color_fg_yellow(),
+			BT_VERSION_GIT,
+			bt_common_color_reset());
+	}
+
+	printf("\n");
+
+	if (strlen(BT_VERSION_DESCRIPTION) > 0) {
+		unsigned int columns;
+		GString *descr;
+
+		if (bt_common_get_term_size(&columns, NULL) < 0) {
+			/* Width not found: default to 80 */
+			columns = 80;
+		}
+
+		descr = bt_common_fold(BT_VERSION_DESCRIPTION, columns, 0);
+		BT_ASSERT(descr);
+		printf("\n%s\n", descr->str);
+		g_string_free(descr, TRUE);
+	}
+
+	if (has_extra) {
+		printf("\n");
+
+		if (has_extra_name) {
+			printf("%sExtra name%s: %s\n",
+				bt_common_color_fg_cyan(),
+				bt_common_color_reset(),
+				BT_VERSION_EXTRA_NAME);
+		}
+
+		if (has_extra_description) {
+			printf("%sExtra description%s:\n  ",
+				bt_common_color_fg_cyan(),
+				bt_common_color_reset());
+			print_and_indent(BT_VERSION_EXTRA_DESCRIPTION);
+		}
+
+		if (has_extra_patch_names) {
+			printf("%sExtra patch names%s:\n  ",
+				bt_common_color_fg_cyan(),
+				bt_common_color_reset());
+			print_and_indent(BT_VERSION_EXTRA_PATCHES);
+		}
 	}
 }
 
@@ -3440,6 +3520,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 					}
 				} else if (current_item_type == CONVERT_CURRENT_ITEM_TYPE_NON_OPT) {
 					uint64_t idx = bt_value_array_get_length(non_opt_loglevels) - 1;
+					enum bt_value_array_set_element_by_index_status set_element_status;
 					bt_value *log_level_str_value;
 
 					log_level_str_value = bt_value_string_create_init(arg);
@@ -3448,9 +3529,11 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 						goto error;
 					}
 
-					if (bt_value_array_set_element_by_index(non_opt_loglevels, idx,
-							log_level_str_value)) {
-						bt_value_put_ref(log_level_str_value);
+					set_element_status =
+						bt_value_array_set_element_by_index(non_opt_loglevels,
+							idx, log_level_str_value);
+					bt_value_put_ref(log_level_str_value);
+					if (set_element_status != BT_VALUE_ARRAY_SET_ELEMENT_BY_INDEX_STATUS_OK) {
 						BT_CLI_LOGE_APPEND_CAUSE_OOM();
 						goto error;
 					}
@@ -4010,7 +4093,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 
 			if (auto_source_discovery_restrict_plugin_name) {
 				plugin_count = 1;
-				plugin = find_loaded_plugin(auto_source_discovery_restrict_plugin_name);
+				plugin = borrow_loaded_plugin_by_name(auto_source_discovery_restrict_plugin_name);
 				plugins = &plugin;
 			} else {
 				plugin_count = get_loaded_plugins_count();