X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=show.c;h=9491110bdcfdbb82d1c0f469a02e47d043fb0875;hp=62a1ac44cafdc2243f8c4663944733d23ff4c303;hb=3f85a61849759896e0e9b009be14a696108d4309;hpb=2b5d1ae678011075ca0413d36395313f7f001f26

diff --git a/show.c b/show.c
index 62a1ac4..9491110 100644
--- a/show.c
+++ b/show.c
@@ -57,6 +57,70 @@ static gint sort_pds(gconstpointer a, gconstpointer b)
 #endif
 
 void show_version(void)
+{
+	GString *s;
+	GSList *l, *l_orig, *m;
+	char *str;
+	const char *lib, *version;
+
+	printf("sigrok-cli %s\n\n", SC_PACKAGE_VERSION_STRING);
+
+	printf("Libraries and features:\n");
+
+	printf("- libsigrok %s/%s (rt: %s/%s).\n",
+		SR_PACKAGE_VERSION_STRING, SR_LIB_VERSION_STRING,
+		sr_package_version_string_get(), sr_lib_version_string_get());
+
+	s = g_string_sized_new(200);
+	g_string_append(s, " - Libs:\n");
+	l_orig = sr_buildinfo_libs_get();
+	for (l = l_orig; l; l = l->next) {
+		m = l->data;
+		lib = m->data;
+		version = m->next->data;
+		g_string_append_printf(s, "  - %s %s\n", lib, version);
+		g_slist_free_full(m, g_free);
+	}
+	g_slist_free(l_orig);
+	s->str[s->len - 1] = '\0';
+	printf("%s\n", s->str);
+	g_string_free(s, TRUE);
+
+	str = sr_buildinfo_host_get();
+	printf("  - Host: %s.\n", str);
+	g_free(str);
+
+	str = sr_buildinfo_scpi_backends_get();
+	printf("  - SCPI backends: %s.\n", str);
+	g_free(str);
+
+#ifdef HAVE_SRD
+	printf("- libsigrokdecode %s/%s (rt: %s/%s).\n",
+		SRD_PACKAGE_VERSION_STRING, SRD_LIB_VERSION_STRING,
+		srd_package_version_string_get(), srd_lib_version_string_get());
+
+	s = g_string_sized_new(200);
+	g_string_append(s, " - Libs:\n");
+	l_orig = srd_buildinfo_libs_get();
+	for (l = l_orig; l; l = l->next) {
+		m = l->data;
+		lib = m->data;
+		version = m->next->data;
+		g_string_append_printf(s, "  - %s %s\n", lib, version);
+		g_slist_free_full(m, g_free);
+	}
+	g_slist_free(l_orig);
+	s->str[s->len - 1] = '\0';
+	printf("%s\n", s->str);
+	g_string_free(s, TRUE);
+
+	str = srd_buildinfo_host_get();
+	printf("  - Host: %s.\n", str);
+	g_free(str);
+#endif
+}
+
+void show_supported(void)
 {
 	struct sr_dev_driver **drivers, *driver;
 	const struct sr_input_module **inputs, *input;
@@ -69,15 +133,6 @@ void show_version(void)
 	struct srd_decoder *dec;
 #endif
 
-	printf("sigrok-cli %s\n\n", SC_PACKAGE_VERSION_STRING);
-
-	printf("Using libsigrok %s (lib version %s).\n",
-	       sr_package_version_string_get(), sr_lib_version_string_get());
-#ifdef HAVE_SRD
-	printf("Using libsigrokdecode %s (lib version %s).\n\n",
-	       srd_package_version_string_get(), srd_lib_version_string_get());
-#endif
-
 	printf("Supported hardware drivers:\n");
 	drivers = sr_driver_list(sr_ctx);
 	for (sl = NULL, i = 0; drivers[i]; i++)