]> git.sommitrealweird.co.uk Git - onak.git/blobdiff - lookup.c
projects / onak.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
cscvs to tla changeset 17
[onak.git] / lookup.c
diff --git a/lookup.c b/lookup.c
index 8f37fd2827b757dfcca443694bd16efe05a3a588..e4ac9cefaecbe36fdbfbb7ba815d3de916e63940 100644 (file)
--- a/lookup.c
+++ b/lookup.c
@@ -18,6 +18,7 @@
 #include "keydb.h"
 #include "keyindex.h"
 #include "mem.h"
 #include "keydb.h"
 #include "keyindex.h"
 #include "mem.h"
+#include "onak-conf.h"
 #include "parsekey.h"
 
 #define OP_UNKNOWN 0
 #include "parsekey.h"
 
 #define OP_UNKNOWN 0
@@ -25,29 +26,32 @@
 #define OP_INDEX   2
 #define OP_VINDEX  3
 
 #define OP_INDEX   2
 #define OP_VINDEX  3
 
-int putnextchar(void *ctx, unsigned char c)
+int putnextchar(void *ctx, size_t count, unsigned char *c)
 {
 {
-        return putchar(c);
+       return printf("%.*s", (int) count, c);
 }
 
 void find_keys(char *search, uint64_t keyid, bool ishex,
                bool fingerprint, bool exact, bool verbose)
 {
        struct openpgp_publickey *publickey = NULL;
 }
 
 void find_keys(char *search, uint64_t keyid, bool ishex,
                bool fingerprint, bool exact, bool verbose)
 {
        struct openpgp_publickey *publickey = NULL;
-       bool found = false;
+       int count = 0;
 
        if (ishex) {
 
        if (ishex) {
-               if (fetch_key(keyid, &publickey)) {
-                       if (publickey != NULL) {
-                               key_index(publickey, verbose, fingerprint,
-                                               true);
-                               free_publickey(publickey);
-                               found = true;
-                       }
-               }
+               count = fetch_key(keyid, &publickey, false);
+       } else {
+               count = fetch_key_text(search, &publickey);
        }
        }
-       if (!found) {
+       if (publickey != NULL) {
+               key_index(publickey, verbose, fingerprint, true);
+               free_publickey(publickey);
+       } else if (count == 0) {
                puts("Key not found.");
                puts("Key not found.");
+       } else {
+               printf("Found %d keys, but maximum number to return is %d.\n",
+                               count,
+                               config.maxkeys);
+               puts("Try again with a more specific search.");
        }
 }
 
        }
 }
 
@@ -78,6 +82,7 @@ int main(int argc, char *argv[])
                        }
                } else if (!strcmp(params[i], "search")) {
                        search = params[i+1];
                        }
                } else if (!strcmp(params[i], "search")) {
                        search = params[i+1];
+                       params[i+1] = NULL;
                        if (search != NULL) {
                                keyid = strtoul(search, &end, 16);
                                if (*search != 0 &&
                        if (search != NULL) {
                                keyid = strtoul(search, &end, 16);
                                if (*search != 0 &&
@@ -95,13 +100,19 @@ int main(int argc, char *argv[])
                                exact = true;
                        }
                }
                                exact = true;
                        }
                }
+               free(params[i]);
+               params[i] = NULL;
+               if (params[i+1] != NULL) {
+                       free(params[i+1]);
+                       params[i+1] = NULL;
+               }
+       }
+       if (params != NULL) {
+               free(params);
+               params = NULL;
        }
 
        }
 
-//     puts("HTTP/1.0 200 OK");
-//     puts("Server: onak 0.0.1");
-       puts("Content-Type: text/html\n");
-       puts("<html>\n<title>Lookup of key</title>");
-       puts("<body>");
+       start_html("Lookup of key");
 
        if (op == OP_UNKNOWN) {
                puts("Error: No operation supplied.");
 
        if (op == OP_UNKNOWN) {
                puts("Error: No operation supplied.");
@@ -111,7 +122,7 @@ int main(int argc, char *argv[])
                initdb();
                switch (op) {
                case OP_GET:
                initdb();
                switch (op) {
                case OP_GET:
-                       if (fetch_key(keyid, &publickey)) {
+                       if (fetch_key(keyid, &publickey, false)) {
                                puts("<pre>");
                                flatten_publickey(publickey,
                                                        &packets,
                                puts("<pre>");
                                flatten_publickey(publickey,
                                                        &packets,
@@ -138,7 +149,13 @@ int main(int argc, char *argv[])
                cleanupdb();
        }
        puts("<hr>");
                cleanupdb();
        }
        puts("<hr>");
-       puts("Produced by onak 0.0.1 by Jonathan McDowell");
-       puts("</body>\n</html>");
+       puts("Produced by onak " VERSION " by Jonathan McDowell");
+       end_html();
+
+       if (search != NULL) {
+               free(search);
+               search = NULL;
+       }
+       
        return (EXIT_SUCCESS);
 }
        return (EXIT_SUCCESS);
 }
Development branch of onak