cscvs to tla changeset 33

[onak.git] / keydb_file.c

diff --git a/keydb_file.c b/keydb_file.c
index 243e59ef83cb60344d189ac0877c71dc7c145646..4c1a6a384b199018b37b80c9ef12b0f019b31a70 100644 (file)
--- 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,12 +81,12 @@ 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);
                close(fd);
        }
@@ -128,7 +113,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,7 +123,7 @@ 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);
        }
 
@@ -157,7 +142,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);