X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/d55ec9e986e5c0c7345ae0e6a1449c4292291b32..f5b6afd16482a73da5d3c366a306dde363a5d7b7:/keydb_file.c

diff --git a/keydb_file.c b/keydb_file.c
index 243e59e..a132ea7 100644
--- a/keydb_file.c
+++ b/keydb_file.c
@@ -15,6 +15,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "charfuncs.h"
 #include "keydb.h"
 #include "keyid.h"
 #include "keystructs.h"
@@ -23,22 +24,6 @@
 #include "onak-conf.h"
 #include "parsekey.h"
 
-/**
- *	keydb_fetchchar - Fetches a char from a file.
- */
-static int keydb_fetchchar(void *fd, size_t count, unsigned char *c)
-{
-	return !(read( *(int *) fd, c, count));
-}
-
-/**
- *	keydb_putchar - Puts a char to a file.
- */
-static int keydb_putchar(void *fd, size_t count, unsigned char *c)
-{
-	return !(write( *(int *) fd, c, count));
-}
-
 /**
  *	initdb - Initialize the key database.
  *
@@ -96,13 +81,15 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
 	char keyfile[1024];
 	int fd = -1;
 
-	snprintf(keyfile, 1023, "%s/0x%llX", config.file_dbpath,
+	snprintf(keyfile, 1023, "%s/0x%llX", config.db_dir,
 			keyid & 0xFFFFFFFF);
 	fd = open(keyfile, O_RDONLY); // | O_SHLOCK);
 
 	if (fd > -1) {
-		read_openpgp_stream(keydb_fetchchar, &fd, &packets);
+		read_openpgp_stream(file_fetchchar, &fd, &packets);
 		parse_keys(packets, publickey);
+		free_packet_list(packets);
+		packets = NULL;
 		close(fd);
 	}
 
@@ -128,7 +115,7 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
 	char keyfile[1024];
 	int fd = -1;
 
-	snprintf(keyfile, 1023, "%s/0x%llX", config.file_dbpath,
+	snprintf(keyfile, 1023, "%s/0x%llX", config.db_dir,
 			get_keyid(publickey) & 0xFFFFFFFF);
 	fd = open(keyfile, O_WRONLY | O_CREAT, 0664); // | O_EXLOCK);
 
@@ -138,8 +125,10 @@ int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)
 		flatten_publickey(publickey, &packets, &list_end);
 		publickey -> next = next;
 		
-		write_openpgp_stream(keydb_putchar, &fd, packets);
+		write_openpgp_stream(file_putchar, &fd, packets);
 		close(fd);
+		free_packet_list(packets);
+		packets = NULL;
 	}
 
 	return (fd > -1);
@@ -157,7 +146,7 @@ int delete_key(uint64_t keyid, bool intrans)
 {
 	char keyfile[1024];
 
-	snprintf(keyfile, 1023, "%s/0x%llX", config.file_dbpath,
+	snprintf(keyfile, 1023, "%s/0x%llX", config.db_dir,
 			keyid & 0xFFFFFFFF);
 
 	return unlink(keyfile);