X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/5b3f77c7fbafb036d20a1577ed74f475e94ed821..fe84894a4052c71965c6a75b013db3dcec23d67d:/keydb_fs.c

diff --git a/keydb_fs.c b/keydb_fs.c
index bc3c890..db188b1 100644
--- a/keydb_fs.c
+++ b/keydb_fs.c
@@ -57,7 +57,7 @@ static uint32_t calchash(uint8_t * ptr)
 static void keypath(char *buffer, uint64_t _keyid)
 {
 	uint64_t keyid = _keyid << 32;
-	snprintf(buffer, PATH_MAX, "%s/key/%02X/%02X/%08X/%016llX",
+	snprintf(buffer, PATH_MAX, "%s/key/%02X/%02X/%08X/%016" PRIX64,
 		 config.db_dir, (uint8_t) ((keyid >> 56) & 0xFF),
 		 (uint8_t) ((keyid >> 48) & 0xFF),
 		 (uint32_t) (keyid >> 32), _keyid);
@@ -95,7 +95,7 @@ static void prove_path_to(uint64_t keyid, char *what)
 
 static void wordpath(char *buffer, char *word, uint32_t hash, uint64_t keyid)
 {
-	snprintf(buffer, PATH_MAX, "%s/words/%02X/%02X/%08X/%s/%016llX",
+	snprintf(buffer, PATH_MAX, "%s/words/%02X/%02X/%08X/%s/%016" PRIX64,
 		 config.db_dir, (uint8_t) ((hash >> 24) & 0xFF),
 		 (uint8_t) ((hash >> 16) & 0xFF), hash, word, keyid);
 }
@@ -109,7 +109,7 @@ static void worddir(char *buffer, char *word, uint32_t hash)
 
 static void subkeypath(char *buffer, uint64_t subkey, uint64_t keyid)
 {
-	snprintf(buffer, PATH_MAX, "%s/subkeys/%02X/%02X/%08X/%016llX",
+	snprintf(buffer, PATH_MAX, "%s/subkeys/%02X/%02X/%08X/%016" PRIX64,
 		 config.db_dir,
 		 (uint8_t) ((subkey >> 24) & 0xFF),
 		 (uint8_t) ((subkey >> 16) & 0xFF),
@@ -208,6 +208,44 @@ static void fs_endtrans(void)
 	fcntl(keydb_lockfile_fd, F_SETLK, &lockstruct);
 }
 
+static uint64_t fs_getfullkeyid(uint64_t keyid)
+{
+	static char buffer[PATH_MAX];
+	DIR *d = NULL;
+	struct dirent *de = NULL;
+	uint64_t ret = 0;
+
+	keydir(buffer, keyid);
+
+	d = opendir(buffer);
+	if (d) {
+		do {
+			de = readdir(d);
+			if (de && de->d_name[0] != '.') {
+				ret = strtoull(de->d_name, NULL, 16);
+			}
+		} while (de && de->d_name[0] == '.');
+		closedir(d);	
+	}
+
+	if (ret == 0) {
+		subkeydir(buffer, keyid);
+
+		d = opendir(buffer);
+		if (d) {
+			do {
+				de = readdir(d);
+				if (de && de->d_name[0] != '.') {
+					ret = strtoull(de->d_name, NULL, 16);
+				}
+			} while (de && de->d_name[0] == '.');
+			closedir(d);
+		}
+	}
+
+	return ret;
+}
+
 /**
  *	fetch_key - Given a keyid fetch the key from storage.
  *	@keyid: The keyid to fetch.
@@ -222,10 +260,10 @@ static int fs_fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
 	struct openpgp_packet_list *packets = NULL;
 
 	if (!intrans)
-		starttrans();
+		fs_starttrans();
 
 	if ((keyid >> 32) == 0)
-		keyid = getfullkeyid(keyid);
+		keyid = fs_getfullkeyid(keyid);
 
 	keypath(buffer, keyid);
 	if ((fd = open(buffer, O_RDONLY)) != -1) {
@@ -239,7 +277,7 @@ static int fs_fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
 	}
 
 	if (!intrans)
-		endtrans();
+		fs_endtrans();
 	return ret;
 }
 
@@ -265,7 +303,7 @@ static int fs_store_key(struct openpgp_publickey *publickey, bool intrans,
 
 
 	if (!intrans)
-		starttrans();
+		fs_starttrans();
 
 	prove_path_to(keyid, "key");
 	keypath(buffer, keyid);
@@ -319,7 +357,7 @@ static int fs_store_key(struct openpgp_publickey *publickey, bool intrans,
 	}
 
 	if (!intrans)
-		endtrans();
+		fs_endtrans();
 	return ret;
 }
 
@@ -338,19 +376,19 @@ static int fs_delete_key(uint64_t keyid, bool intrans)
 	int i = 0;
 
 	if ((keyid >> 32) == 0)
-		keyid = getfullkeyid(keyid);
+		keyid = fs_getfullkeyid(keyid);
 
 	if (!intrans)
-		starttrans();
+		fs_starttrans();
 
-	ret = fetch_key(keyid, &pk, true);
+	ret = fs_fetch_key(keyid, &pk, true);
 
 	if (ret) {
-		logthing(LOGTHING_DEBUG, "Wordlist for key %016llX",
+		logthing(LOGTHING_DEBUG, "Wordlist for key %016" PRIX64,
 			 keyid);
 		wl = wordlist = makewordlistfromkey(wordlist, pk);
 		logthing(LOGTHING_DEBUG,
-			 "Wordlist for key %016llX done", keyid);
+			 "Wordlist for key %016" PRIX64 " done", keyid);
 		while (wl) {
 			uint32_t hash = calchash((uint8_t *) (wl->object));
 			prove_path_to(hash, "words");
@@ -382,7 +420,7 @@ static int fs_delete_key(uint64_t keyid, bool intrans)
 	unlink(buffer);
 
 	if (!intrans)
-		endtrans();
+		fs_endtrans();
 	return 1;
 }
 
@@ -471,7 +509,7 @@ static int fs_fetch_key_text(const char *search,
 	while (wl) {
 		logthing(LOGTHING_DEBUG, "Adding key: %s", wl->object);
 		addedkeys +=
-		    fetch_key(strtoull(wl->object, NULL, 16), publickey,
+		    fs_fetch_key(strtoull(wl->object, NULL, 16), publickey,
 			      false);
 		if (addedkeys >= config.maxkeys)
 			break;
@@ -485,44 +523,6 @@ static int fs_fetch_key_text(const char *search,
 	return addedkeys;
 }
 
-static uint64_t fs_getfullkeyid(uint64_t keyid)
-{
-	static char buffer[PATH_MAX];
-	DIR *d = NULL;
-	struct dirent *de = NULL;
-	uint64_t ret = 0;
-
-	keydir(buffer, keyid);
-
-	d = opendir(buffer);
-	if (d) {
-		do {
-			de = readdir(d);
-			if (de && de->d_name[0] != '.') {
-				ret = strtoull(de->d_name, NULL, 16);
-			}
-		} while (de && de->d_name[0] == '.');
-		closedir(d);	
-	}
-
-	if (ret == 0) {
-		subkeydir(buffer, keyid);
-
-		d = opendir(buffer);
-		if (d) {
-			do {
-				de = readdir(d);
-				if (de && de->d_name[0] != '.') {
-					ret = strtoull(de->d_name, NULL, 16);
-				}
-			} while (de && de->d_name[0] == '.');
-			closedir(d);
-		}
-	}
-	
-	return ret;
-}
-
 /**
  *	iterate_keys - call a function once for each key in the db.
  *	@iterfunc: The function to call.