X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/2eed640f944a24204fa4ed0dbbc80004a800b1eb..refs/heads/switch-to-debhelper:/wordlist.c?ds=sidebyside

diff --git a/wordlist.c b/wordlist.c
index 71299e1..605ec06 100644
--- a/wordlist.c
+++ b/wordlist.c
@@ -1,9 +1,20 @@
 /*
  * 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, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include <ctype.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++;
 		}
@@ -57,7 +68,7 @@ struct ll *makewordlist(struct ll *wordlist, char *word)
 			if (llfind(wordlist, start, 
 				(int (*)(const void *, const void *)) strcmp
 					) == NULL) {
-				wordlist = lladd(wordlist, start);
+				wordlist = lladdend(wordlist, start);
 			}
 		}
 	}