X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/17623ae905ff751306ed51a30fd0ee97ffd00d01..408ea0b9ceafdc9f861701cfb14b57d09aa47777:/keydb_db4.c?ds=inline

diff --git a/keydb_db4.c b/keydb_db4.c
index 3f51cc2..80397aa 100644
--- a/keydb_db4.c
+++ b/keydb_db4.c
@@ -19,6 +19,7 @@
 #include <db.h>
 
 #include "charfuncs.h"
+#include "keyarray.h"
 #include "keydb.h"
 #include "keyid.h"
 #include "decodekey.h"
@@ -143,6 +144,8 @@ void initdb(bool readonly)
 					"Error opening db environment: %s (%s)",
 					config.db_dir,
 					db_strerror(ret));
+			dbenv->close(dbenv, 0);
+			dbenv = NULL;
 		}
 	}
 
@@ -269,6 +272,8 @@ void cleanupdb(void)
 				dbconns[i] = NULL;
 			}
 		}
+		free(dbconns);
+		dbconns = NULL;
 		dbenv->close(dbenv, 0);
 		dbenv = NULL;
 	}
@@ -418,21 +423,21 @@ int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
 	char *searchtext = NULL;
 	struct ll *wordlist = NULL;
 	struct ll *curword = NULL;
-	struct ll *keylist = NULL;
-	struct ll *newkeylist = NULL;
+	struct keyarray keylist = { NULL, 0, 0 };
+	struct keyarray newkeylist = { NULL, 0, 0 };
 
 	numkeys = 0;
 	searchtext = strdup(search);
 	wordlist = makewordlist(wordlist, searchtext);
 
-	starttrans();
+	for (curword = wordlist; curword != NULL; curword = curword->next) {
+		starttrans();
 
-	ret = worddb->cursor(worddb,
-			txn,
-			&cursor,
-			0);   /* flags */
+		ret = worddb->cursor(worddb,
+				txn,
+				&cursor,
+				0);   /* flags */
 
-	for (curword = wordlist; curword != NULL; curword = curword->next) {
 		memset(&key, 0, sizeof(key));
 		memset(&data, 0, sizeof(data));
 		key.data = curword->object;
@@ -452,54 +457,44 @@ int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
 						data.data)[i];
 			}
 
-			if (keylist == NULL ||
-					llfind(keylist, data.data,
-						worddb_cmp) != NULL) {
-				newkeylist = lladd(newkeylist, data.data);
-				data.data = NULL;
-			} else {
-				free(data.data);
-				data.data = NULL;
+			if (keylist.count == 0 ||
+					array_find(&keylist, keyid)) {
+				array_add(&newkeylist, keyid);
 			}
+
+			free(data.data);
+			data.data = NULL;
+
 			ret = cursor->c_get(cursor,
 					&key,
 					&data,
 					DB_NEXT);
 		}
-		llfree(keylist, free);
+		array_free(&keylist);
 		keylist = newkeylist;
-		newkeylist = NULL;
+		newkeylist.keys = NULL;
+		newkeylist.count = newkeylist.size = 0;
 		if (data.data != NULL) {
 			free(data.data);
 			data.data = NULL;
 		}
+		ret = cursor->c_close(cursor);
+		cursor = NULL;
+		endtrans();
 	}
 	llfree(wordlist, NULL);
 	wordlist = NULL;
 	
-	for (newkeylist = keylist;
-			newkeylist != NULL && numkeys < config.maxkeys;
-			newkeylist = newkeylist->next) {
-
-			keyid = 0;
-			for (i = 4; i < 12; i++) {
-				keyid <<= 8;
-				keyid += ((unsigned char *)
-						newkeylist->object)[i];
-			}
-
-			numkeys += fetch_key(keyid,
-					publickey,
-					true);
+	starttrans();
+	for (i = 0; i < keylist.count; i++) {
+		numkeys += fetch_key(keylist.keys[i],
+			publickey,
+			true);
 	}
-	llfree(keylist, free);
-	keylist = NULL;
+	array_free(&keylist);
 	free(searchtext);
 	searchtext = NULL;
 
-	ret = cursor->c_close(cursor);
-	cursor = NULL;
-
 	endtrans();
 	
 	return (numkeys);
@@ -948,65 +943,6 @@ int delete_key(uint64_t keyid, bool intrans)
 	return deadlock ? (-1) : (ret == DB_NOTFOUND);
 }
 
-/**
- *	dumpdb - dump the key database
- *	@filenamebase: The base filename to use for the dump.
- *
- *	Dumps the database into one or more files, which contain pure OpenPGP
- *	that can be reimported into onak or gpg. filenamebase provides a base
- *	file name for the dump; several files may be created, all of which will
- *	begin with this string and then have a unique number and a .pgp
- *	extension.
- */
-int dumpdb(char *filenamebase)
-{
-	DBT   key, data;
-	DBC  *cursor = NULL;
-	int   ret = 0;
-	int   fd = -1;
-	int   i = 0;
-	char  filename[1024];
-
-	filename[1023] = 0;
-	for (i = 0; i < numdbs; i++) {
-		ret = dbconns[i]->cursor(dbconns[i],
-			NULL,
-			&cursor,
-			0);   /* flags */
-
-		snprintf(filename, 1023, "%s.%d.pgp", filenamebase, i);
-		fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, 0640);
-		if (fd == -1) {
-			logthing(LOGTHING_ERROR,
-				"Error opening keydump file (%s): %s",
-				filename,
-				strerror(errno));
-		} else {
-			memset(&key, 0, sizeof(key));
-			memset(&data, 0, sizeof(data));
-			ret = cursor->c_get(cursor, &key, &data, DB_NEXT);
-			while (ret == 0) {
-				write(fd, data.data, data.size);
-				memset(&key, 0, sizeof(key));
-				memset(&data, 0, sizeof(data));
-				ret = cursor->c_get(cursor, &key, &data,
-						DB_NEXT);
-			}
-			if (ret != DB_NOTFOUND) {
-				logthing(LOGTHING_ERROR,
-					"Problem reading key: %s",
-					db_strerror(ret));
-			}
-			close(fd);
-		}
-
-		ret = cursor->c_close(cursor);
-		cursor = NULL;
-	}
-	
-	return 0;
-}
-
 /**
  *	iterate_keys - call a function once for each key in the db.
  *	@iterfunc: The function to call.