X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/3b5b9db0bc2dbe93b3b79e722997606c71ecafb9..f1e930585a5eb8ef184f5a0ad1e85759e01e60d0:/add.c

diff --git a/add.c b/add.c
index 2a99036..32016b5 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.14 2004/05/26 21:20:05 noodles Exp $
  */
 
 #include <errno.h>
@@ -25,11 +27,12 @@
 
 int main(int argc, char *argv[])
 {
-	struct openpgp_packet_list *packets = NULL;
-	struct openpgp_publickey *keys = NULL;
-	char **params = NULL;
-	struct buffer_ctx ctx;
-	int i;
+	struct openpgp_packet_list  *packets = NULL;
+	struct openpgp_publickey    *keys = NULL;
+	char                       **params = NULL;
+	struct buffer_ctx            ctx;
+	int                          count = 0;
+	int                          i;
 
 	memset(&ctx, 0, sizeof(ctx));
 
@@ -53,17 +56,24 @@ int main(int argc, char *argv[])
 	start_html("onak : Add");
 	if (ctx.buffer == NULL) {
 		puts("Error: No keytext to add supplied.");
+		end_html();
 	} else {
-		readconfig();
+		readconfig(NULL);
 		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));
+			printf("Storing %d keys.\n",
+				parse_keys(packets, &keys));
+			end_html();
+			fclose(stdout);
+			fclose(stderr);
+			initdb(false);
+			count = update_keys(&keys);
+			printf("Got %d new keys.\n", count);
+			logthing(LOGTHING_NOTICE, "Got %d new keys.",
+				count);
 			if (keys != NULL) {
 				sendkeysync(keys);
 				free_publickey(keys);
@@ -72,10 +82,10 @@ int main(int argc, char *argv[])
 			cleanupdb();
 		} else {
 			puts("No OpenPGP packets found in input.");
+			end_html();
 		}
 		cleanuplogthing();
 		cleanupconfig();
 	}
-	end_html();
 	return (EXIT_SUCCESS);
 }