cscvs to tla changeset 138

[onak.git] / add.c

diff --git a/add.c b/add.c
index 95f218943b5dcaab6540201e116fe57bce2e5608..f15a145bd3c9e0ffb5138eaaaeb956490c4af6c1 100644 (file)
--- a/add.c
+++ b/add.c
@@ -4,6 +4,8 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
+ *
+ * $Id: add.c,v 1.15 2004/05/31 14:16:49 noodles Exp $
  */
 
 #include <errno.h>
@@ -12,38 +14,26 @@
 #include <string.h>
 
 #include "armor.h"
+#include "cleankey.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;
-       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));
 
@@ -51,6 +41,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]);
                }
@@ -66,20 +57,41 @@ int main(int argc, char *argv[])
        start_html("onak : Add");
        if (ctx.buffer == NULL) {
                puts("Error: No keytext to add supplied.");
+               end_html();
        } else {
-               dearmor_openpgp_stream(cgi_getchar,
+               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, false));
+                       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);
+                               keys = NULL;
+                       }
                        cleanupdb();
                } else {
                        puts("No OpenPGP packets found in input.");
+                       end_html();
                }
+               cleanuplogthing();
+               cleanupconfig();
        }
-       end_html();
        return (EXIT_SUCCESS);
 }