Relax asserts when cleaning up.

[onak.git] / add.c

diff --git a/add.c b/add.c
index b0a7fd227c90f1853612aa08cb1b0d4a3c8d0fb5..189444e294fb2d83af8869b3c943504c30fba810 100644 (file)
--- a/add.c
+++ b/add.c
@@ -12,10 +12,13 @@
 #include <string.h>
 
 #include "armor.h"
 #include <string.h>
 
 #include "armor.h"

+#include "cleankey.h"
+#include "cleanup.h"

 #include "charfuncs.h"
 #include "getcgi.h"
 #include "keydb.h"
 #include "keystructs.h"
 #include "charfuncs.h"
 #include "getcgi.h"
 #include "keydb.h"
 #include "keystructs.h"

+#include "log.h"

 #include "mem.h"
 #include "merge.h"
 #include "onak-conf.h"
 #include "mem.h"
 #include "merge.h"
 #include "onak-conf.h"


@@ -24,11 +27,12 @@
 
 int main(int argc, char *argv[])
 {
 
 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));
 
 
        memset(&ctx, 0, sizeof(ctx));
 


@@ -52,27 +56,43 @@ int main(int argc, char *argv[])
        start_html("onak : Add");
        if (ctx.buffer == NULL) {
                puts("Error: No keytext to add supplied.");
        start_html("onak : Add");
        if (ctx.buffer == NULL) {
                puts("Error: No keytext to add supplied.");

+               end_html();

        } else {
        } else {

+               readconfig(NULL);
+               initlogthing("add", config.logfile);

                dearmor_openpgp_stream(buffer_fetchchar,
                                        &ctx,
                                        &packets);
                if (packets != NULL) {
                dearmor_openpgp_stream(buffer_fetchchar,
                                        &ctx,
                                        &packets);
                if (packets != NULL) {

-                       parse_keys(packets, &keys);
-                       readconfig();
-                       initdb();
-                       printf("Got %d new keys.\n",
-                                       update_keys(&keys, false));
+                       count = parse_keys(packets, &keys);
+                       logthing(LOGTHING_NOTICE, "Received %d keys.",
+                               count);
+                       printf("Storing %d keys.\n", count);
+                       end_html();
+                       fclose(stdout);
+                       fclose(stderr);
+                       catchsignals();
+                       initdb(false);
+                       
+                       count = cleankeys(keys);
+                       logthing(LOGTHING_INFO, "%d keys cleaned.",
+                                       count);
+
+                       count = update_keys(&keys);
+                       logthing(LOGTHING_NOTICE, "Got %d new keys.",
+                               count);

                        if (keys != NULL) {
                                sendkeysync(keys);
                                free_publickey(keys);
                                keys = NULL;
                        }
                        cleanupdb();
                        if (keys != NULL) {
                                sendkeysync(keys);
                                free_publickey(keys);
                                keys = NULL;
                        }
                        cleanupdb();

-                       cleanupconfig();

                } else {
                        puts("No OpenPGP packets found in input.");
                } else {
                        puts("No OpenPGP packets found in input.");

+                       end_html();

                }
                }

+               cleanuplogthing();
+               cleanupconfig();

        }
        }

-       end_html();

        return (EXIT_SUCCESS);
 }
        return (EXIT_SUCCESS);
 }