X-Git-Url: http://the.earth.li/gitweb/?p=onak.git;a=blobdiff_plain;f=wordlist.c;h=6827ba282db2ecc5a7a64e2a02238d4a85991c27;hp=0c2cb62c8154b22540ce749a940493fcc4c3d572;hb=76f079e5ebdb34acaaa2462a8d915ee06d3c8425;hpb=01c34102a1d2f1aefaa1bf3c4fb95ba46c46b551

diff --git a/wordlist.c b/wordlist.c
index 0c2cb62..6827ba2 100644
--- a/wordlist.c
+++ b/wordlist.c
@@ -1,18 +1,29 @@
 /*
  * wordlist.c - Routines for manipulating word lists
  *
- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2004 Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2004 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include <ctype.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "ll.h"
 #include "decodekey.h"
-#include "log.h"
+#include "keystructs.h"
 #include "wordlist.h"
 
 /**
@@ -40,11 +51,11 @@ struct ll *makewordlist(struct ll *wordlist, char *word)
 	end = word;
 	while (end != NULL && *end != 0) {
 		start = end;
-		while (*start != 0 && !isalnum(*start)) {
+		while (*start != 0 && (ispunct(*start) || isspace (*start))) {
 			start++;
 		}
 		end = start;
-		while (*end != 0 && isalnum(*end)) {
+		while (*end != 0 && (!ispunct(*end) && !isspace (*end))) {
 			*end = tolower(*end);
 			end++;
 		}
@@ -86,7 +97,7 @@ struct ll *makewordlistfromkey(struct ll *wordlist,
 	struct ll  *wl = NULL;
 
 	uids = keyuids(key, NULL);
-	for (i = 0; uids[i] != NULL; ++i) {
+	for (i = 0; uids != NULL && uids[i] != NULL; ++i) {
 		words = makewordlist(NULL, uids[i]);
 		for (wl = words; wl != NULL; wl = wl->next) {
 			if (llfind(wordlist, wl->object, 
@@ -95,6 +106,7 @@ struct ll *makewordlistfromkey(struct ll *wordlist,
 				wordlist = lladd(wordlist, strdup(wl->object));
 			}
 		}
+		llfree(words, NULL);
 		free(uids[i]);
 		uids[i] = NULL;
 	}