X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/556f51f104fbbb5bd0d51b61a18d7e5af2759079..393d83b8760584006eaefd6fc370abead228e02a:/merge.c

diff --git a/merge.c b/merge.c
index cfe2d97..d2d2beb 100644
--- a/merge.c
+++ b/merge.c
@@ -6,15 +6,16 @@
  * Copyright 2002 Project Purple
  */
 
-#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
+#include "decodekey.h"
 #include "keydb.h"
 #include "keyid.h"
-#include "keyindex.h"
 #include "keystructs.h"
 #include "ll.h"
+#include "log.h"
 #include "mem.h"
 #include "merge.h"
 
@@ -145,7 +146,9 @@ bool remove_signed_packet(struct openpgp_signedpacket_list **packet_list,
 			if (cur->next == NULL) {
 				*list_end = prev;
 			}
-			// TODO: Free the removed signed packet...
+			/*
+			 * TODO: Free the removed signed packet...
+			 */
 		}
 		prev = cur;
 	}
@@ -170,7 +173,7 @@ int merge_packet_sigs(struct openpgp_signedpacket_list *old,
 	struct openpgp_packet_list	*curpacket = NULL;
 	struct openpgp_packet_list	*nextpacket = NULL;
 
-	assert(compare_packets(old->packet, new->packet));
+	log_assert(compare_packets(old->packet, new->packet));
 
 	curpacket = new->sigs;
 	while (curpacket != NULL) {
@@ -190,7 +193,7 @@ int merge_packet_sigs(struct openpgp_signedpacket_list *old,
 			if (lastpacket != NULL) {
 				lastpacket->next = curpacket->next;
 			} else {
-				assert(curpacket == new->sigs);
+				log_assert(curpacket == new->sigs);
 				new->sigs = curpacket->next;
 			}
 			curpacket->next = NULL;
@@ -315,7 +318,7 @@ int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b)
 				if (lastpacket != NULL) {
 					lastpacket->next = curpacket->next;
 				} else {
-					assert(curpacket == b->revocations);
+					log_assert(curpacket == b->revocations);
 					b->revocations = curpacket->next;
 				}
 				curpacket->next = NULL;
@@ -353,7 +356,6 @@ int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b)
 /**
  *	update_keys - Takes a list of public keys and updates them in the DB.
  *	@keys: The keys to update in the DB.
- *	@verbose: Should we output more information as we add keys?
  *
  *	Takes a list of keys and adds them to the database, merging them with
  *	the key in the database if it's already present there. The key list is
@@ -361,7 +363,7 @@ int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b)
  *	we had before to what we have now (ie the set of data that was added to
  *	the DB). Returns the number of entirely new keys added.
  */
-int update_keys(struct openpgp_publickey **keys, bool verbose)
+int update_keys(struct openpgp_publickey **keys)
 {
 	struct openpgp_publickey *curkey = NULL;
 	struct openpgp_publickey *oldkey = NULL;
@@ -371,13 +373,10 @@ int update_keys(struct openpgp_publickey **keys, bool verbose)
 
 	for (curkey = *keys; curkey != NULL; curkey = curkey->next) {
 		intrans = starttrans();
-		if (verbose) {
-			fprintf(stderr, "Fetching key 0x%llX, result: %d\n",
-				get_keyid(curkey),
-				fetch_key(get_keyid(curkey), &oldkey, intrans));
-		} else {
-			fetch_key(get_keyid(curkey), &oldkey, intrans);
-		}
+		logthing(LOGTHING_INFO,
+			"Fetching key 0x%llX, result: %d",
+			get_keyid(curkey),
+			fetch_key(get_keyid(curkey), &oldkey, intrans));
 
 		/*
 		 * If we already have the key stored in the DB then merge it
@@ -394,25 +393,21 @@ int update_keys(struct openpgp_publickey **keys, bool verbose)
 					*keys = curkey->next;
 				} else {
 					prev->next = curkey->next;
-					prev = curkey->next;
 					curkey->next = NULL;
 					free_publickey(curkey);
+					curkey = prev;
 				}
 			} else {
 				prev = curkey;
-				if (verbose) {
-					fprintf(stderr,
-					"Merged key; storing updated key.\n");
-				}
+				logthing(LOGTHING_INFO,
+					"Merged key; storing updated key.");
 				store_key(oldkey, intrans, true);
 			}
 			free_publickey(oldkey);
 			oldkey = NULL;
 		} else {
-			if (verbose) {
-				fprintf(stderr,
-					"Storing completely new key.\n");
-			}
+			logthing(LOGTHING_INFO,
+				"Storing completely new key.");
 			store_key(curkey, intrans, false);
 			newkeys++;
 		}