implement ElektraInitiative#2561 and enable -N for kdb get

dev2718 · Sep 4, 2021 · d621b14 · d621b14
1 parent d1894c1
commit d621b14
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/src/tools/kdb/get.cpp b/src/tools/kdb/get.cpp
@@ -116,21 +116,13 @@ int GetCommand::execute (Cmdline const & cl)
 	KeySet conf;
 
 	kdb::Key root = cl.createKey (0);
+	string parentKeyName = cl.all ? "/" : cl.getParentKey (root).getName ();
 	kdb::KDB kdb (root);
 
-	std::string n;
-	if (cl.all)
-	{
-		n = root.getName ();
-		root.setName ("/");
-	}
-
+	std::string originalName = root.getName ();
+	root.setName (parentKeyName);
 	kdb.get (conf, root);
-
-	if (cl.all)
-	{
-		root.setName (n);
-	}
+	root.setName (originalName);
 
 	// do a lookup without tracer to warm up default cache
 	conf.lookup (root);

diff --git a/src/tools/kdb/get.hpp b/src/tools/kdb/get.hpp
@@ -21,7 +21,7 @@ class GetCommand : public Command
 
 	virtual std::string getShortOptions () override
 	{
-		return "an";
+		return "anN";
 	}
 
 	virtual std::string getSynopsis () override