X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/2f81a42ec6952ef08a1a440d6044c75882158da0..6bf59599ecd9e30e91c5eefa22472ee080315c30:/add.c diff --git a/add.c b/add.c index 2aba922..f15a145 100644 --- a/add.c +++ b/add.c @@ -5,7 +5,7 @@ * * Copyright 2002 Project Purple * - * $Id: add.c,v 1.13 2004/05/26 18:53:14 noodles Exp $ + * $Id: add.c,v 1.15 2004/05/31 14:16:49 noodles Exp $ */ #include @@ -14,6 +14,7 @@ #include #include "armor.h" +#include "cleankey.h" #include "charfuncs.h" #include "getcgi.h" #include "keydb.h" @@ -56,6 +57,7 @@ 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(NULL); initlogthing("add", config.logfile); @@ -63,8 +65,17 @@ int main(int argc, char *argv[]) &ctx, &packets); if (packets != NULL) { - parse_keys(packets, &keys); + printf("Storing %d keys.\n", + parse_keys(packets, &keys)); + end_html(); + fclose(stdout); + fclose(stderr); initdb(false); + + count = cleankeys(keys); + logthing(LOGTHING_INFO, "%d keys cleaned.", + count); + count = update_keys(&keys); printf("Got %d new keys.\n", count); logthing(LOGTHING_NOTICE, "Got %d new keys.", @@ -77,10 +88,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); }