X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=lookup.c;h=72798ceb103108f2541ec546ea7b87e0ae7cfd65;hb=58d762ea573eb3cfea626bb52ea7a99e24b8a0aa;hp=00bc4165c7a1e59b88af27840aa8d370e85bb503;hpb=34b03028378025ad22c8d29f70e81109cee690c2;p=onak.git

diff --git a/lookup.c b/lookup.c
index 00bc416..72798ce 100644
--- a/lookup.c
+++ b/lookup.c
@@ -4,19 +4,23 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
+ *
+ * $Id: lookup.c,v 1.11 2003/10/04 10:21:41 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"
+#include "log.h"
 #include "mem.h"
 #include "onak-conf.h"
 #include "parsekey.h"
@@ -26,13 +30,8 @@
 #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 fingerprint, bool exact, bool verbose, bool mrhkp)
 {
 	struct openpgp_publickey *publickey = NULL;
 	int count = 0;
@@ -43,15 +42,29 @@ void find_keys(char *search, uint64_t keyid, bool ishex,
 		count = fetch_key_text(search, &publickey);
 	}
 	if (publickey != NULL) {
-		key_index(publickey, verbose, fingerprint, true);
+		if (mrhkp) {
+			printf("info:1:%d\n", count);
+			mrkey_index(publickey);
+		} else {
+			key_index(publickey, verbose, fingerprint, true);
+		}
 		free_publickey(publickey);
 	} else if (count == 0) {
-		puts("Key not found.");
+		if (mrhkp) {
+			puts("info:1:0");
+		} else {
+			puts("Key not found.");
+		}
 	} else {
-		printf("Found %d keys, but maximum number to return is %d.\n",
+		if (mrhkp) {
+			puts("info:1:0");
+		} else {
+			printf("Found %d keys, but maximum number to return"
+				" is %d.\n",
 				count,
 				config.maxkeys);
-		puts("Try again with a more specific search.");
+			puts("Try again with a more specific search.");
+		}
 	}
 }
 
@@ -63,6 +76,7 @@ int main(int argc, char *argv[])
 	bool fingerprint = false;
 	bool exact = false;
 	bool ishex = false;
+	bool mrhkp = false;
 	uint64_t keyid = 0;
 	char *search = NULL;
 	char *end = NULL;
@@ -99,6 +113,15 @@ int main(int argc, char *argv[])
 			if (!strcmp(params[i+1], "on")) {
 				exact = true;
 			}
+		} else if (!strcmp(params[i], "options")) {
+			/*
+			 * TODO: We should be smarter about this; options may
+			 * have several entries. For now mr is the only valid
+			 * one though.
+			 */
+			if (!strcmp(params[i+1], "mr")) {
+				mrhkp = true;
+			}
 		}
 		free(params[i]);
 		params[i] = NULL;
@@ -112,7 +135,11 @@ int main(int argc, char *argv[])
 		params = NULL;
 	}
 
-	start_html("Lookup of key");
+	if (mrhkp) {
+		puts("Content-Type: text/plain\n");
+	} else {
+		start_html("Lookup of key");
+	}
 
 	if (op == OP_UNKNOWN) {
 		puts("Error: No operation supplied.");
@@ -120,6 +147,7 @@ int main(int argc, char *argv[])
 		puts("Error: No key to search for supplied.");
 	} else {
 		readconfig();
+		initlogthing("lookup", config.logfile);
 		initdb();
 		switch (op) {
 		case OP_GET:
@@ -128,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>");
@@ -138,21 +166,24 @@ int main(int argc, char *argv[])
 			break;
 		case OP_INDEX:
 			find_keys(search, keyid, ishex, fingerprint, exact,
-					false);
+					false, mrhkp);
 			break;
 		case OP_VINDEX:
 			find_keys(search, keyid, ishex, fingerprint, exact,
-					true);
+					true, mrhkp);
 			break;
 		default:
 			puts("Unknown operation!");
 		}
 		cleanupdb();
+		cleanuplogthing();
 		cleanupconfig();
 	}
-	puts("<hr>");
-	puts("Produced by onak " VERSION " by Jonathan McDowell");
-	end_html();
+	if (!mrhkp) {
+		puts("<hr>");
+		puts("Produced by onak " VERSION " by Jonathan McDowell");
+		end_html();
+	}
 
 	if (search != NULL) {
 		free(search);