Bump debhelper compat level to 7

[onak.git] / add.c

diff --git a/add.c b/add.c
index 95f218943b5dcaab6540201e116fe57bce2e5608..a33b0c86587b276b770e48e413b537b8ba233ca1 100644 (file)
--- a/add.c
+++ b/add.c
@@ -12,38 +12,26 @@
 #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 "getcgi.h"
 #include "keydb.h"
 #include "keystructs.h"

-#include "parsekey.h"
+#include "log.h"
+#include "mem.h"

 #include "merge.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"

 
 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 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));
 
 
        memset(&ctx, 0, sizeof(ctx));
 


@@ -51,6 +39,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];
        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]);
                }
                } else {
                        free(params[i+1]);
                }


@@ -66,20 +55,50 @@ 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 {

-               dearmor_openpgp_stream(cgi_getchar,
+               readconfig(NULL);
+               initlogthing("add", config.logfile);
+               dearmor_openpgp_stream(buffer_fetchchar,

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

-                       parse_keys(packets, &keys);
-                       initdb();
-                       printf("Got %d new keys.\n",
-                                       update_keys(&keys, false));
-                       cleanupdb();
+                       count = parse_keys(packets, &keys);
+                       logthing(LOGTHING_NOTICE, "Received %d keys.",
+                               count);
+                       printf("Key block added to key server database.\n");
+                       printf("  New public keys added: %d\n", count);
+                       end_html();
+                       if (stdout != NULL && fileno(stdout) != -1) {
+                               fclose(stdout);
+                       }
+                       if (stderr != NULL && stderr != stdout &&
+                                       fileno(stderr) != -1) {
+                               fclose(stderr);
+                       }
+                       catchsignals();
+                       config.dbbackend->initdb(false);
+                       
+                       count = cleankeys(keys);
+                       logthing(LOGTHING_INFO, "%d keys cleaned.",
+                                       count);
+
+                       count = config.dbbackend->update_keys(&keys, true);
+                       logthing(LOGTHING_NOTICE, "Got %d new keys.",
+                               count);
+
+                       if (keys != NULL) {
+                               free_publickey(keys);
+                               keys = NULL;
+                       }
+                       
+                       config.dbbackend->cleanupdb();

                } 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);
 }