Cleanup logging in sixdegrees.c

[onak.git] / gpgwww.c

diff --git a/gpgwww.c b/gpgwww.c
index 570f1a8bc25bdfaef71a56a8d7a950169cf94a1a..44c226ccae6c7a849f7220d1316710ac28482986 100644 (file)
--- a/gpgwww.c
+++ b/gpgwww.c
@@ -4,8 +4,6 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2001-2002 Project Purple.
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2001-2002 Project Purple.

- *
- * $Id: gpgwww.c,v 1.14 2004/05/26 18:53:14 noodles Exp $

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


@@ -15,6 +13,8 @@
 
 #include "armor.h"
 #include "charfuncs.h"
 
 #include "armor.h"
 #include "charfuncs.h"

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

 #include "getcgi.h"
 #include "hash.h"
 #include "keydb.h"
 #include "getcgi.h"
 #include "hash.h"
 #include "keydb.h"


@@ -77,7 +77,7 @@ int getkeyspath(uint64_t have, uint64_t want, int count)
                return 1;
        }
        
                return 1;
        }
        

-       while (pathlen < count) {
+       while ((!cleanup()) && (pathlen < count)) {

                /*
                 * Fill the tree info up.
                 */
                /*
                 * Fill the tree info up.
                 */


@@ -94,7 +94,7 @@ int getkeyspath(uint64_t have, uint64_t want, int count)
                        curkey = findinhash(keyinfoa->parent);
                        while (curkey != NULL && curkey->keyid != 0) {
                                if (curkey->keyid != fullwant && fetch_key(
                        curkey = findinhash(keyinfoa->parent);
                        while (curkey != NULL && curkey->keyid != 0) {
                                if (curkey->keyid != fullwant && fetch_key(

-                                               curkey->keyid & 0xFFFFFFFF,
+                                               curkey->keyid,

                                                        &publickey, false)) {
                                        flatten_publickey(publickey,
                                                        &packets,
                                                        &publickey, false)) {
                                        flatten_publickey(publickey,
                                                        &packets,


@@ -114,7 +114,7 @@ int getkeyspath(uint64_t have, uint64_t want, int count)
        /*
         * Add the destination key to the list of returned keys.
         */
        /*
         * Add the destination key to the list of returned keys.
         */

-       if (fetch_key(fullwant & 0xFFFFFFFF, &publickey, false)) {
+       if (fetch_key(fullwant, &publickey, false)) {

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


@@ -167,6 +167,7 @@ int main(int argc, char *argv[])
 
        readconfig(NULL);
        initlogthing("gpgwww", config.logfile);
 
        readconfig(NULL);
        initlogthing("gpgwww", config.logfile);

+       catchsignals();

        initdb(true);
        inithash();
        logthing(LOGTHING_NOTICE, "Looking for path from 0x%llX to 0x%llX.",
        initdb(true);
        inithash();
        logthing(LOGTHING_NOTICE, "Looking for path from 0x%llX to 0x%llX.",


@@ -184,7 +185,7 @@ int main(int argc, char *argv[])
 
        if (op != OP_GET) {
                puts("<HR>");
 
        if (op != OP_GET) {
                puts("<HR>");

-               puts("Produced by gpgwww " VERSION ", part of onak. "
+               puts("Produced by gpgwww " PACKAGE_VERSION ", part of onak. "

                        "<A HREF=\"mailto:noodles-onak@earth.li\">"
                        "Jonathan McDowell</A>");
                end_html();
                        "<A HREF=\"mailto:noodles-onak@earth.li\">"
                        "Jonathan McDowell</A>");
                end_html();