cscvs to tla changeset 139

[onak.git] / add.c

diff --git a/add.c b/add.c
index 2c6abb93af54ba35aa13ecf223e35a54a0a61a38..f15a145bd3c9e0ffb5138eaaaeb956490c4af6c1 100644 (file)
--- a/add.c
+++ b/add.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2002 Project Purple
  *
  *
  * Copyright 2002 Project Purple
  *

- * $Id: add.c,v 1.10 2003/06/04 20:57:06 noodles Exp $
+ * $Id: add.c,v 1.15 2004/05/31 14:16:49 noodles Exp $

  */
 
 #include <errno.h>
  */
 
 #include <errno.h>


@@ -14,6 +14,7 @@
 #include <string.h>
 
 #include "armor.h"
 #include <string.h>
 
 #include "armor.h"

+#include "cleankey.h"

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


@@ -27,11 +28,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));
 


@@ -55,17 +57,29 @@ 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();
+               readconfig(NULL);

                initlogthing("add", config.logfile);
                dearmor_openpgp_stream(buffer_fetchchar,
                                        &ctx,
                                        &packets);
                if (packets != 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 = 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.",
+                               count);

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


@@ -74,10 +88,10 @@ int main(int argc, char *argv[])
                        cleanupdb();
                } else {
                        puts("No OpenPGP packets found in input.");
                        cleanupdb();
                } else {
                        puts("No OpenPGP packets found in input.");

+                       end_html();

                }
                cleanuplogthing();
                cleanupconfig();
        }
                }
                cleanuplogthing();
                cleanupconfig();
        }

-       end_html();

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