cscvs to tla changeset 3

[onak.git] / merge.c

diff --git a/merge.c b/merge.c
index 96e628be0efb79d9c7e438806b629a7d38248944..8bfbd09eb227c41dbeea3c0afbf1de9f44824157 100644 (file)
--- a/merge.c
+++ b/merge.c
@@ -105,7 +105,9 @@ bool remove_signed_packet(struct openpgp_signedpacket_list **packet_list,
                        if (cur->next == NULL) {
                                *list_end = prev;
                        }
+                       // TODO: Free the removed signed packet...
                }
+               prev = cur;
        }
 
        return found;
@@ -192,25 +194,29 @@ int merge_signed_packets(struct openpgp_signedpacket_list **old,
                        if (newelem->sigs == NULL) {
                                remove_signed_packet(new,
                                                new_end,
-                                               curelem->packet);
+                                               newelem->packet);
                        }
                }
        }
 
        /*
-        * If *new != NULL now then there are UIDs on the new key that weren't
-        * on the old key. Add them.
+        * If *new != NULL now then there might be UIDs on the new key that
+        * weren't on the old key. Walk through them, checking if the UID is
+        * on the old key and if not adding them to it.
         */
        for (curelem = *new; curelem != NULL;
                        curelem = curelem->next) {
-               ADD_PACKET_TO_LIST((*old_end),
+
+               if (find_signed_packet(*old, curelem->packet) == NULL) {
+                       ADD_PACKET_TO_LIST((*old_end),
                                packet_dup(curelem->packet));
-               if (*old == NULL) {
-                       *old = *old_end;
-               }
-               packet_list_add(&(*old_end)->sigs,
+                       if (*old == NULL) {
+                               *old = *old_end;
+                       }
+                       packet_list_add(&(*old_end)->sigs,
                                &(*old_end)->last_sig,
                                curelem->sigs);
+               }
        }
 
        return 0;
@@ -290,7 +296,7 @@ int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b)
                 */
                merge_signed_packets(&a->uids, &a->last_uid, 
                                &b->uids, &b->last_uid);
-               merge_signed_packets(&a->subkeys, &a->last_uid,
+               merge_signed_packets(&a->subkeys, &a->last_subkey,
                                &b->subkeys, &b->last_subkey);
 
        }
@@ -301,6 +307,7 @@ 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
@@ -308,15 +315,23 @@ 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)
+int update_keys(struct openpgp_publickey **keys, bool verbose)
 {
        struct openpgp_publickey *curkey = NULL;
        struct openpgp_publickey *oldkey = NULL;
-       struct  openpgp_publickey *prev = NULL;
+       struct openpgp_publickey *prev = NULL;
        int newkeys = 0;
+       bool intrans;
 
        for (curkey = *keys; curkey != NULL; curkey = curkey->next) {
-               fetch_key(get_keyid(curkey), &oldkey);
+               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);
+               }
 
                /*
                 * If we already have the key stored in the DB then merge it
@@ -337,14 +352,22 @@ int update_keys(struct openpgp_publickey **keys)
                                }
                        } else {
                                prev = curkey;
-                               store_key(oldkey);
+                               if (verbose) {
+                                       fprintf(stderr, "Merged key; storing updated key.\n");
+                               }
+                               store_key(oldkey, intrans, true);
                        }
                        free_publickey(oldkey);
                        oldkey = NULL;
                } else {
-                       store_key(curkey);
+                       if (verbose) {
+                               fprintf(stderr, "Storing completely new key.\n");
+                       }
+                       store_key(curkey, intrans, false);
                        newkeys++;
                }
+               endtrans();
+               intrans = false;
        }
 
        return newkeys;