From d3be58913807b691009d3e2f9792b423deb62952 Mon Sep 17 00:00:00 2001
From: Mirek Kratochvil <exa.exa@gmail.com>
Date: Mon, 15 Apr 2013 16:00:26 +0200
Subject: [PATCH] keyring: a little better structure

---
 src/keyring.cpp | 43 +++++++++++++++++++++++++++++++++++++++++--
 src/keyring.h   | 10 +++++++---
 2 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/src/keyring.cpp b/src/keyring.cpp
index c0c3da7..e2ab9f5 100644
--- a/src/keyring.cpp
+++ b/src/keyring.cpp
@@ -95,14 +95,53 @@ std::string keyring::get_keyid (const std::string&pubkey)
  *
  */
 
+#include <stdlib.h>
+
+static std::string get_user_dir()
+{
+	const char*tmp = getenv ("CCR_DIR");
+	if (tmp) return tmp;
+	const char*home = getenv ("HOME");
+	if (home) return home + "/.ccr";
+	return "./.ccr"; //fallback for desolate systems
+}
+
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+static bool prepare_user_dir (const string&dir)
+{
+	//try to create the directory
+	mkdir (dir.c_str(), 0777);
+
+	//and no matter what, verify it's there
+	struct stat st;
+	if (stat (dir.c_str(), &st) )
+		return false;
+
+	if (!S_ISDIR (st.st_mode) )
+		return false;
+
+	return true; //seems m'kay
+}
+
 bool keyring::load()
 {
 
-	return false;
 }
 
 bool keyring::save()
 {
 
-	return false;
+}
+
+bool keyring::open()
+{
+
+}
+
+bool keyring::close()
+{
+
 }
diff --git a/src/keyring.h b/src/keyring.h
index 27151f0..da3bd97 100644
--- a/src/keyring.h
+++ b/src/keyring.h
@@ -26,6 +26,7 @@
 
 class keyring
 {
+	int fd_priv, fd_pub;
 public:
 	struct pubkey_entry {
 		sencode *key;
@@ -64,18 +65,21 @@ public:
 	std::map<std::string, pubkey_entry> pubs;
 	std::map<std::string, keypair_entry> pairs;
 
-	explicit keyring() {
+	keyring() {
+		fd_priv = fd_pub = -1;
 	}
 
 	~keyring() {
 		clear();
 	}
 
+	void clear();
+
+	bool open();
+	bool close();
 	bool load();
 	bool save();
 
-	void clear();
-
 	static std::string get_keyid (const std::string& pubkey);
 
 	static std::string get_keyid (sencode* pubkey) {