cscvs to tla changeset 117

[onak.git] / onak.c

diff --git a/onak.c b/onak.c
index bba213b57b703c9cabed79165bde3631716f8134..0fdb7e4bf7510456cd9498422b808cc4e773201b 100644 (file)
--- a/onak.c
+++ b/onak.c
@@ -7,7 +7,7 @@
  * 
  * Copyright 2002 Project Purple
  *
  * 
  * Copyright 2002 Project Purple
  *

- * $Id: onak.c,v 1.14 2003/06/07 13:37:33 noodles Exp $
+ * $Id: onak.c,v 1.19 2004/03/23 12:33:47 noodles Exp $

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


@@ -16,6 +16,7 @@
 #include <unistd.h>
 
 #include "armor.h"
 #include <unistd.h>
 
 #include "armor.h"

+#include "charfuncs.h"

 #include "keydb.h"
 #include "keyid.h"
 #include "keyindex.h"
 #include "keydb.h"
 #include "keyid.h"
 #include "keyindex.h"


@@ -26,28 +27,6 @@
 #include "onak-conf.h"
 #include "parsekey.h"
 
 #include "onak-conf.h"
 #include "parsekey.h"
 

-int stdin_getchar(void *ctx, size_t count, unsigned char *c)
-{
-       int ic;
-
-       do {
-               ic = getchar();
-               *c = ic;
-               c++;
-       } while ((ic != EOF) && (--count > 0));
-       return (ic == EOF);
-}
-
-int stdout_putchar(void *ctx, size_t count, unsigned char *c)
-{
-       int i;
-
-       for (i = 0; i < count; i++) {
-               putchar(c[i]);
-       }
-       return 0;
-}
-

 void find_keys(char *search, uint64_t keyid, bool ishex,
                bool fingerprint, bool exact, bool verbose)
 {
 void find_keys(char *search, uint64_t keyid, bool ishex,
                bool fingerprint, bool exact, bool verbose)
 {


@@ -92,6 +71,7 @@ int main(int argc, char *argv[])
        struct openpgp_packet_list      *packets = NULL;
        struct openpgp_packet_list      *list_end = NULL;
        struct openpgp_publickey        *keys = NULL;
        struct openpgp_packet_list      *packets = NULL;
        struct openpgp_packet_list      *list_end = NULL;
        struct openpgp_publickey        *keys = NULL;

+       char                            *configfile = NULL;

        int                              rc = EXIT_SUCCESS;
        int                              result = 0;
        char                            *search = NULL;
        int                              rc = EXIT_SUCCESS;
        int                              result = 0;
        char                            *search = NULL;


@@ -104,11 +84,14 @@ int main(int argc, char *argv[])
        bool                             fingerprint = false;
        int                              optchar;
 
        bool                             fingerprint = false;
        int                              optchar;
 

-       while ((optchar = getopt(argc, argv, "bfuv")) != -1 ) {
+       while ((optchar = getopt(argc, argv, "bc:fuv")) != -1 ) {

                switch (optchar) {
                case 'b': 
                        binary = true;
                        break;
                switch (optchar) {
                case 'b': 
                        binary = true;
                        break;

+               case 'c':
+                       configfile = strdup(optarg);
+                       break;

                case 'f': 
                        fingerprint = true;
                        break;
                case 'f': 
                        fingerprint = true;
                        break;


@@ -122,19 +105,19 @@ int main(int argc, char *argv[])
                }
        }
 
                }
        }
 

-       readconfig();
+       readconfig(configfile);

        initlogthing("onak", config.logfile);
 
        if ((argc - optind) < 1) {
                usage();
        } else if (!strcmp("dump", argv[optind])) {
        initlogthing("onak", config.logfile);
 
        if ((argc - optind) < 1) {
                usage();
        } else if (!strcmp("dump", argv[optind])) {

-               initdb();
+               initdb(true);

                dumpdb("keydump");
                cleanupdb();
        } else if (!strcmp("add", argv[optind])) {
                if (binary) {
                        result = read_openpgp_stream(stdin_getchar, NULL,
                dumpdb("keydump");
                cleanupdb();
        } else if (!strcmp("add", argv[optind])) {
                if (binary) {
                        result = read_openpgp_stream(stdin_getchar, NULL,

-                                &packets);
+                                &packets, 0);

                        logthing(LOGTHING_INFO,
                                        "read_openpgp_stream: %d", result);
                } else {
                        logthing(LOGTHING_INFO,
                                        "read_openpgp_stream: %d", result);
                } else {


@@ -147,7 +130,7 @@ int main(int argc, char *argv[])
                        logthing(LOGTHING_INFO, "Finished reading %d keys.",
                                        result);
 
                        logthing(LOGTHING_INFO, "Finished reading %d keys.",
                                        result);
 

-                       initdb();
+                       initdb(false);

                        logthing(LOGTHING_NOTICE, "Got %d new keys.",
                                        update_keys(&keys));
                        if (keys != NULL && update) {
                        logthing(LOGTHING_NOTICE, "Got %d new keys.",
                                        update_keys(&keys));
                        if (keys != NULL && update) {


@@ -183,7 +166,7 @@ int main(int argc, char *argv[])
                                ishex = true;
                        }
                }
                                ishex = true;
                        }
                }

-               initdb();
+               initdb(false);

                if (!strcmp("index", argv[optind])) {
                        find_keys(search, keyid, ishex, fingerprint,
                                        false, false);
                if (!strcmp("index", argv[optind])) {
                        find_keys(search, keyid, ishex, fingerprint,
                                        false, false);