X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/4b8483ae278577a3adc8d84da81d77019704466f..340e776784a8902d43e6c4658c45254202e2779e:/lookup.c
diff --git a/lookup.c b/lookup.c
index 8f37fd2..e4ac9ce 100644
--- a/lookup.c
+++ b/lookup.c
@@ -18,6 +18,7 @@
#include "keydb.h"
#include "keyindex.h"
#include "mem.h"
+#include "onak-conf.h"
#include "parsekey.h"
#define OP_UNKNOWN 0
@@ -25,29 +26,32 @@
#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;
- bool found = false;
+ int count = 0;
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.");
+ } 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];
+ params[i+1] = NULL;
if (search != NULL) {
keyid = strtoul(search, &end, 16);
if (*search != 0 &&
@@ -95,13 +100,19 @@ int main(int argc, char *argv[])
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("\nLookup of key");
- puts("");
+ start_html("Lookup of key");
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:
- if (fetch_key(keyid, &publickey)) {
+ if (fetch_key(keyid, &publickey, false)) {
puts("");
flatten_publickey(publickey,
&packets,
@@ -138,7 +149,13 @@ int main(int argc, char *argv[])
cleanupdb();
}
puts("
");
- puts("Produced by onak 0.0.1 by Jonathan McDowell");
- puts("\n");
+ puts("Produced by onak " VERSION " by Jonathan McDowell");
+ end_html();
+
+ if (search != NULL) {
+ free(search);
+ search = NULL;
+ }
+
return (EXIT_SUCCESS);
}