X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/8e58a1769ce5e492dd68904dfc81b6e077fc2a3a..4c697995f8aa32c5ab1474509691d100e5f06a3f:/lookup.c?ds=sidebyside
diff --git a/lookup.c b/lookup.c
index 3c55a61..d6017d2 100644
--- a/lookup.c
+++ b/lookup.c
@@ -17,8 +17,9 @@
#include "getcgi.h"
#include "keydb.h"
#include "keyindex.h"
+#include "log.h"
#include "mem.h"
-#include "onak_conf.h"
+#include "onak-conf.h"
#include "parsekey.h"
#define OP_UNKNOWN 0
@@ -26,9 +27,9 @@
#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,
@@ -38,7 +39,7 @@ void find_keys(char *search, uint64_t keyid, bool ishex,
int count = 0;
if (ishex) {
- count = fetch_key(keyid, &publickey);
+ count = fetch_key(keyid, &publickey, false);
} else {
count = fetch_key_text(search, &publickey);
}
@@ -82,6 +83,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 &&
@@ -99,23 +101,31 @@ 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.");
} else if (search == NULL) {
puts("Error: No key to search for supplied.");
} else {
+ readconfig();
+ initlogthing("lookup", config.logfile);
initdb();
switch (op) {
case OP_GET:
- if (fetch_key(keyid, &publickey)) {
+ if (fetch_key(keyid, &publickey, false)) {
puts("");
flatten_publickey(publickey,
&packets,
@@ -140,9 +150,17 @@ int main(int argc, char *argv[])
puts("Unknown operation!");
}
cleanupdb();
+ cleanuplogthing();
+ cleanupconfig();
}
puts("
");
puts("Produced by onak " VERSION " by Jonathan McDowell");
- puts("\n");
+ end_html();
+
+ if (search != NULL) {
+ free(search);
+ search = NULL;
+ }
+
return (EXIT_SUCCESS);
}