Update version to mark arch build.

[onak.git] / lookup.c

diff --git a/lookup.c b/lookup.c
index 123ec5f1ee936aa91f9750fe5928031b89793407..e5cd1ae8e79f452cbd91169ba46db992cede62fd 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"


@@ -103,7 +104,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,6 +158,7 @@ int main(int argc, char *argv[])
        } else {
                readconfig(NULL);
                initlogthing("lookup", config.logfile);
        } else {
                readconfig(NULL);
                initlogthing("lookup", config.logfile);

+               catchsignals();

                initdb(true);
                switch (op) {
                case OP_GET:
                initdb(true);
                switch (op) {
                case OP_GET:


@@ -164,6 +166,7 @@ int main(int argc, char *argv[])
                                        keyid);
                        if (fetch_key(keyid, &publickey, false)) {
                                puts("<pre>");
                                        keyid);
                        if (fetch_key(keyid, &publickey, false)) {
                                puts("<pre>");

+                               cleankeys(publickey);

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


@@ -209,7 +212,8 @@ int main(int argc, char *argv[])
        }
        if (!mrhkp) {
                puts("<hr>");
        }
        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();
        }