X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=wordlist.c;h=71299e12c88fd3e811965bbd337ba8c9ad07fd5b;hb=a047e3e158d560af079bec920460711d8222317c;hp=0a9a836a67e10c7c2ca5e57c609f72edfe3f9c63;hpb=46c27e2883a78388c895dc883dbb9b902fc8350d;p=onak.git

diff --git a/wordlist.c b/wordlist.c
index 0a9a836..71299e1 100644
--- a/wordlist.c
+++ b/wordlist.c
@@ -4,8 +4,6 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2004 Project Purple
- *
- * $Id: wordlist.c,v 1.1 2004/05/27 03:34:35 noodles Exp $
  */
 
 #include <ctype.h>
@@ -56,7 +54,9 @@ struct ll *makewordlist(struct ll *wordlist, char *word)
 				end++;
 			}
 
-			if (llfind(wordlist, start, strcmp) == NULL) {
+			if (llfind(wordlist, start, 
+				(int (*)(const void *, const void *)) strcmp
+					) == NULL) {
 				wordlist = lladd(wordlist, start);
 			}
 		}
@@ -80,12 +80,21 @@ struct ll *makewordlist(struct ll *wordlist, char *word)
 struct ll *makewordlistfromkey(struct ll *wordlist,
 			       struct openpgp_publickey *key)
 {
-	char **uids;
-	int i;
+	char      **uids;
+	int         i;
+	struct ll  *words = NULL;
+	struct ll  *wl = NULL;
 
 	uids = keyuids(key, NULL);
 	for (i = 0; uids[i] != NULL; ++i) {
-		wordlist = makewordlist(wordlist, uids[i]);
+		words = makewordlist(NULL, uids[i]);
+		for (wl = words; wl != NULL; wl = wl->next) {
+			if (llfind(wordlist, wl->object, 
+				(int (*)(const void *, const void *)) strcmp
+						) == NULL) {
+				wordlist = lladd(wordlist, strdup(wl->object));
+			}
+		}
 		free(uids[i]);
 		uids[i] = NULL;
 	}