Fix Debian changelog versions for real 0.3.5 release.

[onak.git] / add.c

diff --git a/add.c b/add.c
index 2aba92216a39893c362aad6f16ed5264437cd730..3a9161f6b86c5231df65727f24031af4c618aad0 100644 (file)
--- a/add.c
+++ b/add.c
@@ -4,8 +4,6 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple

- *
- * $Id: add.c,v 1.13 2004/05/26 18:53:14 noodles Exp $

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


@@ -14,6 +12,8 @@
 #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 "charfuncs.h"
 #include "getcgi.h"
 #include "keydb.h"


@@ -23,7 +23,6 @@
 #include "merge.h"
 #include "onak-conf.h"
 #include "parsekey.h"
 #include "merge.h"
 #include "onak-conf.h"
 #include "parsekey.h"

-#include "sendsync.h"

 
 int main(int argc, char *argv[])
 {
 
 int main(int argc, char *argv[])
 {


@@ -56,6 +55,7 @@ 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 {
                readconfig(NULL);
                initlogthing("add", config.logfile);
        } else {
                readconfig(NULL);
                initlogthing("add", config.logfile);


@@ -63,24 +63,41 @@ int main(int argc, char *argv[])
                                        &ctx,
                                        &packets);
                if (packets != NULL) {
                                        &ctx,
                                        &packets);
                if (packets != NULL) {

-                       parse_keys(packets, &keys);
-                       initdb(false);
-                       count = update_keys(&keys);
-                       printf("Got %d new keys.\n", count);
+                       count = parse_keys(packets, &keys);
+                       logthing(LOGTHING_NOTICE, "Received %d keys.",
+                               count);
+                       printf("Storing %d keys.\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);
                        logthing(LOGTHING_NOTICE, "Got %d new keys.",
                                count);

+

                        if (keys != NULL) {
                        if (keys != NULL) {

-                               sendkeysync(keys);

                                free_publickey(keys);
                                keys = NULL;
                        }
                                free_publickey(keys);
                                keys = NULL;
                        }

-                       cleanupdb();
+                       
+                       config.dbbackend->cleanupdb();

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

+                       end_html();

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

-       end_html();

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