cscvs to tla changeset 78

[onak.git] / onak.c

diff --git a/onak.c b/onak.c
index 87b65e806ade99f0bc3cfb94dedfad709333070e..e2622e445a2e3658fd71aac5ff69d7718793bf09 100644 (file)
--- a/onak.c
+++ b/onak.c
@@ -6,6 +6,8 @@
  * Jonathan McDowell <noodles@earth.li>
  * 
  * Copyright 2002 Project Purple
  * Jonathan McDowell <noodles@earth.li>
  * 
  * Copyright 2002 Project Purple

+ *
+ * $Id: onak.c,v 1.13 2003/06/04 20:57:12 noodles Exp $

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


@@ -18,6 +20,7 @@
 #include "keyid.h"
 #include "keyindex.h"
 #include "keystructs.h"
 #include "keyid.h"
 #include "keyindex.h"
 #include "keystructs.h"

+#include "log.h"

 #include "mem.h"
 #include "merge.h"
 #include "onak-conf.h"
 #include "mem.h"
 #include "merge.h"
 #include "onak-conf.h"


@@ -74,8 +77,11 @@ void usage(void) {
        puts("Usage:\n");
        puts("\tonak [options] <command> <parameters>\n");
        puts("\tCommands:\n");
        puts("Usage:\n");
        puts("\tonak [options] <command> <parameters>\n");
        puts("\tCommands:\n");

-       puts("\tadd    - read armored OpenPGP keys from stdin and add to the keyserver");
+       puts("\tadd    - read armored OpenPGP keys from stdin and add to the"
+               " keyserver");

        puts("\tdelete - delete a given key from the keyserver");
        puts("\tdelete - delete a given key from the keyserver");

+       puts("\tdump   - dump all the keys from the keyserver to a file or"
+               " files\n\t         starting keydump*");

        puts("\tget    - retrieves the key requested from the keyserver");
        puts("\tindex  - search for a key and list it");
        puts("\tvindex - search for a key and list it and its signatures");
        puts("\tget    - retrieves the key requested from the keyserver");
        puts("\tindex  - search for a key and list it");
        puts("\tvindex - search for a key and list it and its signatures");


@@ -87,49 +93,77 @@ int main(int argc, char *argv[])
        struct openpgp_packet_list      *list_end = NULL;
        struct openpgp_publickey        *keys = NULL;
        int                              rc = EXIT_SUCCESS;
        struct openpgp_packet_list      *list_end = NULL;
        struct openpgp_publickey        *keys = NULL;
        int                              rc = EXIT_SUCCESS;

+       int                              result = 0;

        char                            *search = NULL;
        char                            *end = NULL;
        uint64_t                         keyid = 0;
        bool                             ishex = false;
        bool                             verbose = false;
        char                            *search = NULL;
        char                            *end = NULL;
        uint64_t                         keyid = 0;
        bool                             ishex = false;
        bool                             verbose = false;

+       bool                             update = false;

        bool                             binary = false;
        bool                             binary = false;

+       bool                             fingerprint = false;

        int                              optchar;
 
        int                              optchar;
 

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

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

+               case 'f': 
+                       fingerprint = true;
+                       break;
+               case 'u': 
+                       update = true;
+                       break;

                case 'v': 
                        verbose = true;
                case 'v': 
                        verbose = true;

+                       setlogthreshold(LOGTHING_INFO);

                        break;
                }
        }
 
                        break;
                }
        }
 

+       readconfig();
+       initlogthing("onak", config.logfile);
+

        if ((argc - optind) < 1) {
                usage();
        if ((argc - optind) < 1) {
                usage();

+       } else if (!strcmp("dump", argv[optind])) {
+               initdb();
+               dumpdb("keydump");
+               cleanupdb();

        } else if (!strcmp("add", argv[optind])) {
                if (binary) {
        } else if (!strcmp("add", argv[optind])) {
                if (binary) {

-                       read_openpgp_stream(stdin_getchar, NULL, &packets);
+                       result = read_openpgp_stream(stdin_getchar, NULL,
+                                &packets);
+                       logthing(LOGTHING_INFO,
+                                       "read_openpgp_stream: %d", result);

                } else {
                        dearmor_openpgp_stream(stdin_getchar, NULL, &packets);
                }
                if (packets != NULL) {
                } else {
                        dearmor_openpgp_stream(stdin_getchar, NULL, &packets);
                }
                if (packets != NULL) {

-                       parse_keys(packets, &keys);
+                       result = parse_keys(packets, &keys);

                        free_packet_list(packets);
                        packets = NULL;
                        free_packet_list(packets);
                        packets = NULL;

-                       if (verbose) {
-                               fprintf(stderr, "Finished reading keys.\n");
-                       }
-       
+                       logthing(LOGTHING_INFO, "Finished reading %d keys.",
+                                       result);
+

                        initdb();
                        initdb();

-                       fprintf(stderr, "Got %d new keys.\n",
-                                       update_keys(&keys, verbose));
+                       logthing(LOGTHING_NOTICE, "Got %d new keys.",
+                                       update_keys(&keys));
+                       if (keys != NULL && update) {
+                               flatten_publickey(keys,
+                                       &packets,
+                                       &list_end);
+                               armor_openpgp_stream(stdout_putchar,
+                                       NULL,
+                                       packets);
+                               free_packet_list(packets);
+                               packets = NULL;
+                       }

                        cleanupdb();
                } else {
                        rc = 1;
                        cleanupdb();
                } else {
                        rc = 1;

-                       fprintf(stderr, "No keys read.\n");
+                       logthing(LOGTHING_NOTICE, "No keys read.");

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


@@ -137,7 +171,7 @@ int main(int argc, char *argv[])
                        keys = NULL;
                } else {
                        rc = 1;
                        keys = NULL;
                } else {
                        rc = 1;

-                       fprintf(stderr, "No changes.\n");
+                       logthing(LOGTHING_NOTICE, "No changes.");

                }
        } else if ((argc - optind) == 2) {
                search = argv[optind+1];
                }
        } else if ((argc - optind) == 2) {
                search = argv[optind+1];


@@ -151,22 +185,25 @@ int main(int argc, char *argv[])
                }
                initdb();
                if (!strcmp("index", argv[optind])) {
                }
                initdb();
                if (!strcmp("index", argv[optind])) {

-                       find_keys(search, keyid, ishex, false, false, false);
+                       find_keys(search, keyid, ishex, fingerprint,
+                                       false, false);

                } else if (!strcmp("vindex", argv[optind])) {
                } else if (!strcmp("vindex", argv[optind])) {

-                       find_keys(search, keyid, ishex, false, false, true);
+                       find_keys(search, keyid, ishex, fingerprint,
+                                       false, true);

                } else if (!strcmp("delete", argv[optind])) {
                        delete_key(getfullkeyid(keyid), false);
                } else if (!strcmp("get", argv[optind])) {
                        if (fetch_key(keyid, &keys, false)) {
                } else if (!strcmp("delete", argv[optind])) {
                        delete_key(getfullkeyid(keyid), false);
                } else if (!strcmp("get", argv[optind])) {
                        if (fetch_key(keyid, &keys, false)) {

-                               if (verbose) {
-                                       fprintf(stderr, "Got key.\n");
-                               }
+                               logthing(LOGTHING_INFO, "Got key.");

                                flatten_publickey(keys,
                                                &packets,
                                                &list_end);
                                flatten_publickey(keys,
                                                &packets,
                                                &list_end);

+                               free_publickey(keys);

                                armor_openpgp_stream(stdout_putchar,
                                                NULL,
                                                packets);
                                armor_openpgp_stream(stdout_putchar,
                                                NULL,
                                                packets);

+                               free_packet_list(packets);
+                               packets = NULL;

                        } else {
                                puts("Key not found");
                        }
                        } else {
                                puts("Key not found");
                        }


@@ -176,5 +213,8 @@ int main(int argc, char *argv[])
                usage();
        }
 
                usage();
        }
 

+       cleanuplogthing();
+       cleanupconfig();
+

        return rc;
 }
        return rc;
 }