cscvs to tla changeset 121

[onak.git] / lookup.c

diff --git a/lookup.c b/lookup.c
index 33d023d9357d8a81607541a2ecdb9f7d2b8e54be..b8242563d8b62d9b28b50631bd13cb27c785c5dc 100644 (file)
--- a/lookup.c
+++ b/lookup.c
@@ -5,17 +5,18 @@
  *
  * Copyright 2002 Project Purple
  *
- * $Id: lookup.c,v 1.9 2003/06/04 22:11:41 noodles Exp $
+ * $Id: lookup.c,v 1.13 2004/03/23 12:33:47 noodles Exp $
  */
 
-//#include <stdint.h>
 #include <inttypes.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 #include "armor.h"
+#include "charfuncs.h"
 #include "getcgi.h"
 #include "keydb.h"
 #include "keyindex.h"
@@ -29,11 +30,6 @@
 #define OP_INDEX   2
 #define OP_VINDEX  3
 
-int putnextchar(void *ctx, size_t count, unsigned char *c)
-{
-       return printf("%.*s", (int) count, c);
-}
-
 void find_keys(char *search, uint64_t keyid, bool ishex,
                bool fingerprint, bool exact, bool verbose, bool mrhkp)
 {
@@ -150,9 +146,9 @@ int main(int argc, char *argv[])
        } else if (search == NULL) {
                puts("Error: No key to search for supplied.");
        } else {
-               readconfig();
+               readconfig(NULL);
                initlogthing("lookup", config.logfile);
-               initdb();
+               initdb(true);
                switch (op) {
                case OP_GET:
                        if (fetch_key(keyid, &publickey, false)) {
@@ -160,7 +156,7 @@ int main(int argc, char *argv[])
                                flatten_publickey(publickey,
                                                        &packets,
                                                        &list_end);
-                               armor_openpgp_stream(putnextchar,
+                               armor_openpgp_stream(stdout_putchar,
                                                NULL,
                                                packets);
                                puts("</pre>");