X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/200b89a2c66c58c41a27883f021850445698b337..ce8be6edbed5c435a8f957781a26e6f9eac6fcec:/add.c?ds=inline

diff --git a/add.c b/add.c
index 95f2189..2c6abb9 100644
--- a/add.c
+++ b/add.c
@@ -4,6 +4,8 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
+ *
+ * $Id: add.c,v 1.10 2003/06/04 20:57:06 noodles Exp $
  */
 
 #include <errno.h>
@@ -12,37 +14,23 @@
 #include <string.h>
 
 #include "armor.h"
+#include "charfuncs.h"
 #include "getcgi.h"
 #include "keydb.h"
 #include "keystructs.h"
-#include "parsekey.h"
+#include "log.h"
+#include "mem.h"
 #include "merge.h"
-
-struct cgi_get_ctx {
-	char *buffer;
-	int offset;
-};
-
-
-int cgi_getchar(void *ctx, size_t count, unsigned char *c)
-{
-	struct cgi_get_ctx *buf = NULL;
-
-	buf = (struct cgi_get_ctx *) ctx;
-
-	while (count-- > 0 && *c != 0) {
-		*c = buf->buffer[buf->offset++];
-	}
-
-	return (*c == 0);
-}
+#include "onak-conf.h"
+#include "parsekey.h"
+#include "sendsync.h"
 
 int main(int argc, char *argv[])
 {
 	struct openpgp_packet_list *packets = NULL;
 	struct openpgp_publickey *keys = NULL;
 	char **params = NULL;
-	struct cgi_get_ctx ctx;
+	struct buffer_ctx ctx;
 	int i;
 
 	memset(&ctx, 0, sizeof(ctx));
@@ -51,6 +39,7 @@ int main(int argc, char *argv[])
 	for (i = 0; params != NULL && params[i] != NULL; i += 2) {
 		if (!strcmp(params[i], "keytext")) {
 			ctx.buffer = params[i+1];
+			ctx.size = strlen(ctx.buffer);
 		} else {
 			free(params[i+1]);
 		}
@@ -67,18 +56,27 @@ int main(int argc, char *argv[])
 	if (ctx.buffer == NULL) {
 		puts("Error: No keytext to add supplied.");
 	} else {
-		dearmor_openpgp_stream(cgi_getchar,
+		readconfig();
+		initlogthing("add", config.logfile);
+		dearmor_openpgp_stream(buffer_fetchchar,
 					&ctx,
 					&packets);
 		if (packets != NULL) {
 			parse_keys(packets, &keys);
 			initdb();
 			printf("Got %d new keys.\n",
-					update_keys(&keys, false));
+					update_keys(&keys));
+			if (keys != NULL) {
+				sendkeysync(keys);
+				free_publickey(keys);
+				keys = NULL;
+			}
 			cleanupdb();
 		} else {
 			puts("No OpenPGP packets found in input.");
 		}
+		cleanuplogthing();
+		cleanupconfig();
 	}
 	end_html();
 	return (EXIT_SUCCESS);