Make keyd background itself by default

[onak.git] / lookup.c

diff --git a/lookup.c b/lookup.c
index 123ec5f1ee936aa91f9750fe5928031b89793407..e670d498f0a38189d9fb347254f3a6d1f5fa5023 100644 (file)
--- a/lookup.c
+++ b/lookup.c
@@ -4,8 +4,6 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple

- *
- * $Id: lookup.c,v 1.16 2004/05/27 21:58:18 noodles Exp $

  */
 
 #include <inttypes.h>
  */
 
 #include <inttypes.h>


@@ -17,6 +15,9 @@
 
 #include "armor.h"
 #include "charfuncs.h"
 
 #include "armor.h"
 #include "charfuncs.h"

+#include "cleankey.h"
+#include "cleanup.h"
+#include "config.h"

 #include "getcgi.h"
 #include "keydb.h"
 #include "keyindex.h"
 #include "getcgi.h"
 #include "keydb.h"
 #include "keyindex.h"


@@ -39,9 +40,9 @@ void find_keys(char *search, uint64_t keyid, bool ishex,
        int count = 0;
 
        if (ishex) {
        int count = 0;
 
        if (ishex) {

-               count = fetch_key(keyid, &publickey, false);
+               count = config.dbbackend->fetch_key(keyid, &publickey, false);

        } else {
        } else {

-               count = fetch_key_text(search, &publickey);
+               count = config.dbbackend->fetch_key_text(search, &publickey);

        }
        if (publickey != NULL) {
                if (mrhkp) {
        }
        if (publickey != NULL) {
                if (mrhkp) {


@@ -86,6 +87,7 @@ int main(int argc, char *argv[])
        struct openpgp_publickey *publickey = NULL;
        struct openpgp_packet_list *packets = NULL;
        struct openpgp_packet_list *list_end = NULL;
        struct openpgp_publickey *publickey = NULL;
        struct openpgp_packet_list *packets = NULL;
        struct openpgp_packet_list *list_end = NULL;

+       int result;

 
        params = getcgivars(argc, argv);
        for (i = 0; params != NULL && params[i] != NULL; i += 2) {
 
        params = getcgivars(argc, argv);
        for (i = 0; params != NULL && params[i] != NULL; i += 2) {


@@ -103,7 +105,7 @@ int main(int argc, char *argv[])
                        search = params[i+1];
                        params[i+1] = NULL;
                        if (search != NULL) {
                        search = params[i+1];
                        params[i+1] = NULL;
                        if (search != NULL) {

-                               keyid = strtoul(search, &end, 16);
+                               keyid = strtoull(search, &end, 16);

                                if (*search != 0 &&
                                                end != NULL &&
                                                *end == 0) {
                                if (*search != 0 &&
                                                end != NULL &&
                                                *end == 0) {


@@ -157,13 +159,27 @@ int main(int argc, char *argv[])
        } else {
                readconfig(NULL);
                initlogthing("lookup", config.logfile);
        } else {
                readconfig(NULL);
                initlogthing("lookup", config.logfile);

-               initdb(true);
+               catchsignals();
+               config.dbbackend->initdb(false);

                switch (op) {
                case OP_GET:
                switch (op) {
                case OP_GET:

-                       logthing(LOGTHING_NOTICE, "Getting keyid 0x%llX",
+                       if (ishex) {
+                               logthing(LOGTHING_NOTICE, 
+                                       "Getting keyid 0x%llX",

                                        keyid);
                                        keyid);

-                       if (fetch_key(keyid, &publickey, false)) {
+                               result = config.dbbackend->fetch_key(keyid,
+                                       &publickey, false);
+                       } else {
+                               logthing(LOGTHING_NOTICE, 
+                                       "Getting key(s) for search text %s",
+                                       search);
+                               result = config.dbbackend->fetch_key_text(
+                                       search,
+                                       &publickey);
+                       }
+                       if (result) {

                                puts("<pre>");
                                puts("<pre>");

+                               cleankeys(publickey);

                                flatten_publickey(publickey,
                                                        &packets,
                                                        &list_end);
                                flatten_publickey(publickey,
                                                        &packets,
                                                        &list_end);


@@ -186,11 +202,13 @@ int main(int argc, char *argv[])
                                        true, mrhkp);
                        break;
                case OP_PHOTO:
                                        true, mrhkp);
                        break;
                case OP_PHOTO:

-                       if (fetch_key(keyid, &publickey, false)) {
+                       if (config.dbbackend->fetch_key(keyid, &publickey,
+                                       false)) {

                                unsigned char *photo = NULL;
                                size_t         length = 0;
 
                                unsigned char *photo = NULL;
                                size_t         length = 0;
 

-                               if (getphoto(publickey, 0, &photo, &length)) {
+                               if (getphoto(publickey, indx, &photo,
+                                               &length)) {

                                        fwrite(photo,
                                                        1,
                                                        length,
                                        fwrite(photo,
                                                        1,
                                                        length,


@@ -203,13 +221,14 @@ int main(int argc, char *argv[])
                default:
                        puts("Unknown operation!");
                }
                default:
                        puts("Unknown operation!");
                }

-               cleanupdb();
+               config.dbbackend->cleanupdb();

                cleanuplogthing();
                cleanupconfig();
        }
        if (!mrhkp) {
                puts("<hr>");
                cleanuplogthing();
                cleanupconfig();
        }
        if (!mrhkp) {
                puts("<hr>");

-               puts("Produced by onak " VERSION " by Jonathan McDowell");
+               puts("Produced by onak " PACKAGE_VERSION 
+                               " by Jonathan McDowell");

                end_html();
        }
 
                end_html();
        }