From 86d3afc213ca61509674e49f6d322d767c895b0b Mon Sep 17 00:00:00 2001
From: Mirek Kratochvil <exa.exa@gmail.com>
Date: Sun, 21 Apr 2013 10:52:02 +0200
Subject: [PATCH] actions: list secrets

---
 src/actions.cpp   | 26 ++++++++++++++++++++++++++
 src/str_match.cpp |  6 +++---
 src/str_match.h   |  6 +++---
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/actions.cpp b/src/actions.cpp
index c16b187..67add45 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -180,6 +180,32 @@ int action_rename (bool yes,
 int action_list_sec (bool nice_fingerprint, const std::string&filter,
                      keyring&KR)
 {
+	for (keyring::keypair_storage::iterator
+	     i = KR.pairs.begin(), e = KR.pairs.end();
+	     i != e; ++i) {
+
+		if (!keyspec_matches (filter, i->second.pub.name, i->first) )
+			continue;
+
+		if (!nice_fingerprint)
+			out ("keypair\t"
+			     << i->second.pub.alg << '\t'
+			     << '@' << i->first.substr (0, 22) << "...\t"
+			     << "\"" << i->second.pub.name << "\"");
+		else {
+			out ("key pair with algorithm " << i->second.pub.alg
+			     << ", name `" << i->second.pub.name << "'");
+
+			std::cout << "  fingerprint ";
+			for (size_t j = 0; j < i->first.length(); ++j) {
+				std::cout << i->first[j];
+				if (! ( (j + 1) % 4) &&
+				    j < i->first.length() - 1)
+					std::cout << ':';
+			}
+			std::cout << std::endl << std::endl;
+		}
+	}
 	return 0;
 }
 
diff --git a/src/str_match.cpp b/src/str_match.cpp
index e23b306..dbfacbd 100644
--- a/src/str_match.cpp
+++ b/src/str_match.cpp
@@ -30,9 +30,9 @@ bool algorithm_name_matches (const std::string& search,
 	return true;
 }
 
-bool key_matches (const std::string&search,
-                  const std::string&name,
-                  const std::string&keyid)
+bool keyspec_matches (const std::string&search,
+                      const std::string&name,
+                      const std::string&keyid)
 {
 	if (!search.length() ) return true;
 	if (search[0] == '@') { //match for keyID
diff --git a/src/str_match.h b/src/str_match.h
index 5a868a4..d603f0b 100644
--- a/src/str_match.h
+++ b/src/str_match.h
@@ -24,8 +24,8 @@
 bool algorithm_name_matches (const std::string& search,
                              const std::string&name);
 
-bool key_matches (const std::string&search,
-                  const std::string&name,
-                  const std::string&keyid);
+bool keyspec_matches (const std::string&search,
+                      const std::string&name,
+                      const std::string&keyid);
 
 #endif