X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/394938c479925750ffe56c28d281945ba4003a14..68784e7ff81a477fd4a973ba302d96285def9b7d:/gpgwww.c

diff --git a/gpgwww.c b/gpgwww.c
index cd3e096..44c226c 100644
--- a/gpgwww.c
+++ b/gpgwww.c
@@ -13,6 +13,8 @@
 
 #include "armor.h"
 #include "charfuncs.h"
+#include "cleanup.h"
+#include "config.h"
 #include "getcgi.h"
 #include "hash.h"
 #include "keydb.h"
@@ -75,7 +77,7 @@ int getkeyspath(uint64_t have, uint64_t want, int count)
 		return 1;
 	}
 	
-	while (pathlen < count) {
+	while ((!cleanup()) && (pathlen < count)) {
 		/*
 		 * Fill the tree info up.
 		 */
@@ -165,6 +167,7 @@ int main(int argc, char *argv[])
 
 	readconfig(NULL);
 	initlogthing("gpgwww", config.logfile);
+	catchsignals();
 	initdb(true);
 	inithash();
 	logthing(LOGTHING_NOTICE, "Looking for path from 0x%llX to 0x%llX.",
@@ -182,7 +185,7 @@ int main(int argc, char *argv[])
 
 	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();