kdb-cli: rewrite meta-show

src/tools/kdb/factory.hpp

@@ -48,7 +48,6 @@
 #include <rm.hpp>
 #include <sget.hpp>
 #include <shell.hpp>
-#include <showmeta.hpp>
 #include <specmount.hpp>
 #include <test.hpp>
 #include <umount.hpp>
@@ -89,7 +88,6 @@ class Factory
 		m_factory.insert (std::make_pair ("remount", std::make_shared<Cnstancer<RemountCommand>> ()));
 		m_factory.insert (std::make_pair ("shell", std::make_shared<Cnstancer<ShellCommand>> ()));
 		m_factory.insert (std::make_pair ("find", std::make_shared<Cnstancer<FindCommand>> ()));
-		m_factory.insert (std::make_pair ("meta-show", std::make_shared<Cnstancer<ShowMetaCommand>> ()));
 		m_factory.insert (std::make_pair ("meta-rm", std::make_shared<Cnstancer<MetaRemoveCommand>> ()));
 		m_factory.insert (std::make_pair ("plugin-info", std::make_shared<Cnstancer<PluginInfoCommand>> ()));
 		m_factory.insert (std::make_pair ("test", std::make_shared<Cnstancer<TestCommand>> ()));

src/tools/kdb/meta-show.c

@@ -0,0 +1,76 @@
+/**
+ * @file
+ *
+ * @brief Implementation of kdb meta-show command
+ *
+ * @copyright BSD License (see LICENSE.md or https://www.libelektra.org)
+ */
+
+#include <meta-show.h>
+
+#include <command.h>
+#include <kdbassert.h>
+#include <kdbease.h>
+#include <kdberrors.h>
+#include <string.h>
+
+#define COMMAND_NAME "meta/show"
+
+#define GET_OPTION_KEY(options, name) GET_OPT_KEY (options, COMMAND_BASE_KEY (COMMAND_NAME) "/" name)
+#define GET_OPTION(options, name) GET_OPT (options, COMMAND_BASE_KEY (COMMAND_NAME) "/" name)
+
+void addMetaShowSpec (KeySet * spec)
+{
+	ksAppendKey (spec, keyNew (COMMAND_SPEC_KEY (COMMAND_NAME), KEY_META, "description",
+				   "Print all metakeys with their value for a key.", KEY_META, "command", "show", KEY_END));
+	ksAppendKey (spec, keyNew (COMMAND_SPEC_KEY (COMMAND_NAME) "/keyname", KEY_META, "description", "The name of the key", KEY_META,
+				   "args", "indexed", KEY_META, "args/index", "0", KEY_END));
+	ADD_BASIC_OPTIONS (spec, COMMAND_SPEC_KEY (COMMAND_NAME))
+}
+
+int execMetaShow (KeySet * options, Key * errorKey)
+{
+	int ret = 0;
+	GET_BASIC_OPTIONS
+
+	bool nullTerm = false;
+	tmp = GET_OPTION_KEY (options, "nullterm");
+	if (tmp != NULL)
+	{
+		elektraKeyToBoolean (tmp, &nullTerm);
+	}
+
+	const char * name = getKeyNameFromOptions (options, GET_OPTION (options, "keyname"), errorKey, verbose);
+	if (name == NULL) return 1;
+
+	Key * toLookUp = keyNew (name, KEY_END);
+	KeySet * conf = ksNew (0, KS_END);
+	KDB * handle = kdbOpen (NULL, errorKey);
+
+	if (kdbGet (handle, conf, toLookUp) == -1)
+	{
+		ELEKTRA_SET_VALIDATION_SEMANTIC_ERRORF (errorKey, "could not load '%s': %s", name, GET_ERR (toLookUp));
+		ret = 1;
+		goto cleanup;
+	}
+
+	Key * key = ksLookup (conf, toLookUp, KDB_O_NONE);
+	KeySet * metaKeys = keyMeta (key);
+
+	Key * cur = NULL;
+	for (elektraCursor it = 0; it < ksGetSize (metaKeys); ++it)
+	{
+		cur = ksAtCursor (metaKeys, it);
+		CLI_PRINT (CLI_LOG_NONE, "%s -> %s%c", keyName (cur), BOLD(keyString (cur)), nullTerm ? '\0' : '\n');
+
+	}
+
+
+cleanup:
+	kdbClose (handle, errorKey);
+	ksDel (conf);
+	keyDel (toLookUp);
+	elektraFree (fmtBuffer);
+	elektraFree ((void *) name);
+	return ret;
+}

src/tools/kdb/meta-show.h

@@ -0,0 +1,33 @@
+/**
+ * @file
+ *
+ * @brief Header for meta-show command
+ *
+ * @copyright BSD License (see LICENSE.md or https://www.libelektra.org)
+ */
+
+#ifndef ELEKTRA_KDB_META_SHOW_H
+#define ELEKTRA_KDB_META_SHOW_H
+
+#include <kdb.h>
+
+/**
+ * Adds options specification of meta-show command to @spec
+ *
+ * @param spec the base spec where the commands spec should be added
+ */
+void addMetaShowSpec (KeySet * spec);
+
+/**
+ * Executes the meta-show command
+ *
+ * @param options cli options and arguments as specified in @addMetaShowSpec()
+ * @param errorKey key where errors and warnings should be saved
+ *
+ * @retval 0 show command ran without errors
+ * @retval 1 errors occurred, keyGetMeta (errorKey, "error/reason") for info
+ *
+ */
+int execMetaShow (KeySet * options, Key * errorKey);
+
+#endif // ELEKTRA_KDB_META_SHOW_H

src/tools/kdb/meta.c

@@ -10,6 +10,7 @@
 #include <meta-get.h>
 #include <meta-ls.h>
 #include <meta-set.h>
+#include <meta-show.h>
 
 #include <command.h>
 #include <kdb.h>
@@ -24,6 +25,7 @@ command metaSubcommands[] = {
 	{ "get", addMetaGetSpec, execMetaGet },
 	{ "ls", addMetaLsSpec, execMetaLs },
 	{ "set", addMetaSetSpec, execMetaSet },
+	{ "show", addMetaShowSpec, execMetaShow },
 };
 
 void addMetaSpec (KeySet * spec)