X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/e94ac8da0e87d66927f746e6053fdafbee85cd16..1a72b8d85895fc9ffba0d8f6a9240634ce6ee8dc:/keydb_fs.c?ds=sidebyside

diff --git a/keydb_fs.c b/keydb_fs.c
index 14a954f..bc3c890 100644
--- a/keydb_fs.c
+++ b/keydb_fs.c
@@ -54,7 +54,7 @@ static uint32_t calchash(uint8_t * ptr)
 }
 
 
-void keypath(char *buffer, uint64_t _keyid)
+static void keypath(char *buffer, uint64_t _keyid)
 {
 	uint64_t keyid = _keyid << 32;
 	snprintf(buffer, PATH_MAX, "%s/key/%02X/%02X/%08X/%016llX",
@@ -63,7 +63,7 @@ void keypath(char *buffer, uint64_t _keyid)
 		 (uint32_t) (keyid >> 32), _keyid);
 }
 
-void keydir(char *buffer, uint64_t _keyid)
+static void keydir(char *buffer, uint64_t _keyid)
 {
 	uint64_t keyid = _keyid << 32;
 	snprintf(buffer, PATH_MAX, "%s/key/%02X/%02X/%08X", config.db_dir,
@@ -72,7 +72,7 @@ void keydir(char *buffer, uint64_t _keyid)
 		 (uint32_t) (keyid >> 32));
 }
 
-void prove_path_to(uint64_t keyid, char *what)
+static void prove_path_to(uint64_t keyid, char *what)
 {
 	static char buffer[1024];
 	snprintf(buffer, PATH_MAX, "%s/%s", config.db_dir, what);
@@ -93,21 +93,21 @@ void prove_path_to(uint64_t keyid, char *what)
 	mkdir(buffer, 0777);
 }
 
-void wordpath(char *buffer, char *word, uint32_t hash, uint64_t keyid)
+static void wordpath(char *buffer, char *word, uint32_t hash, uint64_t keyid)
 {
 	snprintf(buffer, PATH_MAX, "%s/words/%02X/%02X/%08X/%s/%016llX",
 		 config.db_dir, (uint8_t) ((hash >> 24) & 0xFF),
 		 (uint8_t) ((hash >> 16) & 0xFF), hash, word, keyid);
 }
 
-void worddir(char *buffer, char *word, uint32_t hash)
+static void worddir(char *buffer, char *word, uint32_t hash)
 {
 	snprintf(buffer, PATH_MAX, "%s/words/%02X/%02X/%08X/%s", config.db_dir,
 		 (uint8_t) ((hash >> 24) & 0xFF),
 		 (uint8_t) ((hash >> 16) & 0xFF), hash, word);
 }
 
-void subkeypath(char *buffer, uint64_t subkey, uint64_t keyid)
+static void subkeypath(char *buffer, uint64_t subkey, uint64_t keyid)
 {
 	snprintf(buffer, PATH_MAX, "%s/subkeys/%02X/%02X/%08X/%016llX",
 		 config.db_dir,
@@ -117,7 +117,7 @@ void subkeypath(char *buffer, uint64_t subkey, uint64_t keyid)
 		 keyid);
 }
 
-void subkeydir(char *buffer, uint64_t subkey)
+static void subkeydir(char *buffer, uint64_t subkey)
 {
 	snprintf(buffer, PATH_MAX, "%s/subkeys/%02X/%02X/%08X",
 		 config.db_dir,
@@ -131,7 +131,7 @@ void subkeydir(char *buffer, uint64_t subkey)
 /**
  *	initdb - Initialize the key database.
  */
-void initdb(bool readonly)
+static void fs_initdb(bool readonly)
 {
 	char buffer[PATH_MAX];
 
@@ -167,7 +167,7 @@ void initdb(bool readonly)
 /**
  *	cleanupdb - De-initialize the key database.
  */
-void cleanupdb(void)
+static void fs_cleanupdb(void)
 {
 	/* Mmmm nothing to do here? */
 	close(keydb_lockfile_fd);
@@ -176,7 +176,7 @@ void cleanupdb(void)
 /**
  *	starttrans - Start a transaction.
  */
-bool starttrans(void)
+static bool fs_starttrans(void)
 {
 	struct flock lockstruct;
 	int remaining = 20;
@@ -197,7 +197,7 @@ bool starttrans(void)
 /**
  *	endtrans - End a transaction.
  */
-void endtrans(void)
+static void fs_endtrans(void)
 {
 	struct flock lockstruct;
 
@@ -214,7 +214,7 @@ void endtrans(void)
  *	@publickey: A pointer to a structure to return the key in.
  *	@intrans: If we're already in a transaction.
  */
-int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
+static int fs_fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
 	      bool intrans)
 {
 	static char buffer[PATH_MAX];
@@ -249,7 +249,7 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
  *	@intrans: If we're already in a transaction.
  *	@update: If true the key exists and should be updated.
  */
-int store_key(struct openpgp_publickey *publickey, bool intrans,
+static int fs_store_key(struct openpgp_publickey *publickey, bool intrans,
 	      bool update)
 {
 	static char buffer[PATH_MAX];
@@ -328,7 +328,7 @@ int store_key(struct openpgp_publickey *publickey, bool intrans,
  *	@keyid: The keyid to delete.
  *	@intrans: If we're already in a transaction.
  */
-int delete_key(uint64_t keyid, bool intrans)
+static int fs_delete_key(uint64_t keyid, bool intrans)
 {
 	static char buffer[PATH_MAX];
 	int ret;
@@ -346,10 +346,10 @@ int delete_key(uint64_t keyid, bool intrans)
 	ret = fetch_key(keyid, &pk, true);
 
 	if (ret) {
-		logthing(LOGTHING_CRITICAL, "Wordlist for key %016llX",
+		logthing(LOGTHING_DEBUG, "Wordlist for key %016llX",
 			 keyid);
 		wl = wordlist = makewordlistfromkey(wordlist, pk);
-		logthing(LOGTHING_CRITICAL,
+		logthing(LOGTHING_DEBUG,
 			 "Wordlist for key %016llX done", keyid);
 		while (wl) {
 			uint32_t hash = calchash((uint8_t *) (wl->object));
@@ -396,7 +396,7 @@ static struct ll *internal_get_key_by_word(char *word, struct ll *mct)
 
 	worddir(buffer, word, hash);
 	d = opendir(buffer);
-	logthing(LOGTHING_CRITICAL, "Scanning for word %s in dir %s", word,
+	logthing(LOGTHING_DEBUG, "Scanning for word %s in dir %s", word,
 		 buffer);
 	if (d)
 		do {
@@ -407,7 +407,7 @@ static struct ll *internal_get_key_by_word(char *word, struct ll *mct)
 					(int (*)(const void *, const void *))
 						    strcmp) !=
 					NULL)) {
-					logthing(LOGTHING_CRITICAL,
+					logthing(LOGTHING_DEBUG,
 						 "Found %s // %s", word,
 						 de->d_name);
 					keys =
@@ -426,7 +426,7 @@ static struct ll *internal_get_key_by_word(char *word, struct ll *mct)
  *	@search: The text to search for.
  *	@publickey: A pointer to a structure to return the key in.
  */
-int fetch_key_text(const char *search,
+static int fs_fetch_key_text(const char *search,
 		   struct openpgp_publickey **publickey)
 {
 	struct ll *wordlist = NULL, *wl = NULL;
@@ -434,7 +434,7 @@ int fetch_key_text(const char *search,
 	char      *searchtext = NULL;
 	int addedkeys = 0;
 
-	logthing(LOGTHING_CRITICAL, "Search was '%s'", search);
+	logthing(LOGTHING_DEBUG, "Search was '%s'", search);
 
 	searchtext = strdup(search);
 	wl = wordlist = makewordlist(wordlist, searchtext);
@@ -469,7 +469,7 @@ int fetch_key_text(const char *search,
 	/* Now add the keys... */
 	wl = keylist;
 	while (wl) {
-		logthing(LOGTHING_CRITICAL, "Adding key: %s", wl->object);
+		logthing(LOGTHING_DEBUG, "Adding key: %s", wl->object);
 		addedkeys +=
 		    fetch_key(strtoull(wl->object, NULL, 16), publickey,
 			      false);
@@ -485,16 +485,7 @@ int fetch_key_text(const char *search,
 	return addedkeys;
 }
 
-/*
- *	dumpdb - dump the key database
- *	@filenamebase: The base filename to use for the dump.
- */
-int dumpdb(char *filenamebase)
-{
-	return 0;
-}
-
-uint64_t getfullkeyid(uint64_t keyid)
+static uint64_t fs_getfullkeyid(uint64_t keyid)
 {
 	static char buffer[PATH_MAX];
 	DIR *d = NULL;
@@ -532,9 +523,44 @@ uint64_t getfullkeyid(uint64_t keyid)
 	return ret;
 }
 
+/**
+ *	iterate_keys - call a function once for each key in the db.
+ *	@iterfunc: The function to call.
+ *	@ctx: A context pointer
+ *
+ *	Calls iterfunc once for each key in the database. ctx is passed
+ *	unaltered to iterfunc. This function is intended to aid database dumps
+ *	and statistic calculations.
+ *
+ *	Returns the number of keys we iterated over.
+ */
+static int fs_iterate_keys(void (*iterfunc)(void *ctx,
+		struct openpgp_publickey *key),	void *ctx)
+{
+	return 0;
+}
+
 /*
  * Include the basic keydb routines.
  */
 #define NEED_KEYID2UID 1
 #define NEED_GETKEYSIGS 1
+#define NEED_UPDATEKEYS 1
 #include "keydb.c"
+
+struct dbfuncs keydb_fs_funcs = {
+	.initdb			= fs_initdb,
+	.cleanupdb		= fs_cleanupdb,
+	.starttrans		= fs_starttrans,
+	.endtrans		= fs_endtrans,
+	.fetch_key		= fs_fetch_key,
+	.fetch_key_text		= fs_fetch_key_text,
+	.store_key		= fs_store_key,
+	.update_keys		= generic_update_keys,
+	.delete_key		= fs_delete_key,
+	.getkeysigs		= generic_getkeysigs,
+	.cached_getkeysigs	= generic_cached_getkeysigs,
+	.keyid2uid		= generic_keyid2uid,
+	.getfullkeyid		= fs_getfullkeyid,
+	.iterate_keys		= fs_iterate_keys,
+};