]> the.earth.li Git - onak.git/blobdiff - add.c
cscvs to tla changeset 123
[onak.git] / add.c
diff --git a/add.c b/add.c
index 2a99036adbe2fe017359f00962a027b8a9127fce..2aba92216a39893c362aad6f16ed5264437cd730 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.13 2004/05/26 18:53:14 noodles Exp $
  */
 
 #include <errno.h>
 
 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));
 
@@ -54,16 +57,18 @@ int main(int argc, char *argv[])
        if (ctx.buffer == NULL) {
                puts("Error: No keytext to add supplied.");
        } else {
-               readconfig();
+               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));
+                       initdb(false);
+                       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);