Add support for displaying Elgamal encrypt or sign keys (deprecated)

[onak.git] / wordlist.c

diff --git a/wordlist.c b/wordlist.c
index 173cc568c4333c68f81c4705744a92c3b3b12f1b..791c55d96e6fb10274c9084b12d7ed8541280b33 100644 (file)
--- a/wordlist.c
+++ b/wordlist.c
@@ -4,8 +4,6 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2004 Project Purple
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2004 Project Purple

- *
- * $Id: wordlist.c,v 1.2 2004/05/28 02:55:49 noodles Exp $

  */
 
 #include <ctype.h>
  */
 
 #include <ctype.h>


@@ -42,11 +40,11 @@ struct ll *makewordlist(struct ll *wordlist, char *word)
        end = word;
        while (end != NULL && *end != 0) {
                start = end;
        end = word;
        while (end != NULL && *end != 0) {
                start = end;

-               while (*start != 0 && !isalnum(*start)) {
+               while (*start != 0 && (ispunct(*start) || isspace (*start))) {

                        start++;
                }
                end = start;
                        start++;
                }
                end = start;

-               while (*end != 0 && isalnum(*end)) {
+               while (*end != 0 && (!ispunct(*end) && !isspace (*end))) {

                        *end = tolower(*end);
                        end++;
                }
                        *end = tolower(*end);
                        end++;
                }


@@ -56,8 +54,10 @@ struct ll *makewordlist(struct ll *wordlist, char *word)
                                end++;
                        }
 
                                end++;
                        }
 

-                       if (llfind(wordlist, start, strcmp) == NULL) {
-                               wordlist = lladd(wordlist, start);
+                       if (llfind(wordlist, start, 
+                               (int (*)(const void *, const void *)) strcmp
+                                       ) == NULL) {
+                               wordlist = lladdend(wordlist, start);

                        }
                }
        }
                        }
                }
        }


@@ -87,9 +87,11 @@ struct ll *makewordlistfromkey(struct ll *wordlist,
 
        uids = keyuids(key, NULL);
        for (i = 0; uids[i] != NULL; ++i) {
 
        uids = keyuids(key, NULL);
        for (i = 0; uids[i] != NULL; ++i) {

-               words = makewordlist(wordlist, uids[i]);
-               for (wl = words; wl->next; wl = wl->next) {
-                       if (llfind(wordlist, wl->object, strcmp) == NULL) {
+               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));
                        }
                }
                                wordlist = lladd(wordlist, strdup(wl->object));
                        }
                }