cscvs to tla changeset 7

[onak.git] / lookup.c
diff --git a/lookup.c b/lookup.c

index 3c55a61f1f2e6022fa1a699b38da197aacab1a09..e4ac9cefaecbe36fdbfbb7ba815d3de916e63940 100644 (file)
--- a/lookup.c
+++ b/lookup.c
@@ -18,7 +18,7 @@
  #include "keydb.h"
  #include "keyindex.h"
  #include "mem.h"
-#include "onak_conf.h"
+#include "onak-conf.h"
  #include "parsekey.h"
  
  #define OP_UNKNOWN 0
@@ -26,9 +26,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 +38,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 +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 &&
@@ -99,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("<html>\n<title>Lookup of key</title>");
-       puts("<body>");
+       start_html("Lookup of key");
  
         if (op == OP_UNKNOWN) {
                 puts("Error: No operation supplied.");
@@ -115,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("<pre>");
                                 flatten_publickey(publickey,
                                                         &packets,
@@ -143,6 +150,12 @@ int main(int argc, char *argv[])
         }
         puts("<hr>");
         puts("Produced by onak " VERSION " by Jonathan McDowell");
-       puts("</body>\n</html>");
+       end_html();
+
+       if (search != NULL) {
+               free(search);
+               search = NULL;
+       }
+       
         return (EXIT_SUCCESS);
  }