X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/e02c731dfbb288c736f2cd09a9b6df0507c59ddd..f830858154d6bf294a06cb79fb219b6404cb4295:/lookup.c diff --git a/lookup.c b/lookup.c index 94f38c8..d6017d2 100644 --- a/lookup.c +++ b/lookup.c @@ -17,6 +17,7 @@ #include "getcgi.h" #include "keydb.h" #include "keyindex.h" +#include "log.h" #include "mem.h" #include "onak-conf.h" #include "parsekey.h" @@ -28,7 +29,7 @@ int putnextchar(void *ctx, size_t count, unsigned char *c) { - return printf("%.*s", count, c); + return printf("%.*s", (int) count, c); } void find_keys(char *search, uint64_t keyid, bool ishex, @@ -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,19 +101,27 @@ 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: @@ -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); }