cscvs to tla changeset 109

[onak.git] / onak.c

diff --git a/onak.c b/onak.c
index 311b44f9b16d9e67a741d04d7666280886e851e1..2da86c915cae8708a192c7f0668cda6bc6eb6076 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.17 2003/09/30 20:40:11 noodles Exp $

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


@@ -14,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"


@@ -24,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)
 {


@@ -78,6 +59,8 @@ void usage(void) {
        puts("\tadd    - read armored OpenPGP keys from stdin and add to the"
                " keyserver");
        puts("\tdelete - delete a given key from 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("\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");


@@ -130,7 +113,7 @@ int main(int argc, char *argv[])
        } else if (!strcmp("add", argv[optind])) {
                if (binary) {
                        result = read_openpgp_stream(stdin_getchar, NULL,
        } 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 {


@@ -189,11 +172,15 @@ int main(int argc, char *argv[])
                } else if (!strcmp("delete", argv[optind])) {
                        delete_key(getfullkeyid(keyid), false);
                } else if (!strcmp("get", argv[optind])) {
                } else if (!strcmp("delete", argv[optind])) {
                        delete_key(getfullkeyid(keyid), false);
                } else if (!strcmp("get", argv[optind])) {

-                       if (fetch_key(keyid, &keys, false)) {
+                       if (!ishex) {
+                               puts("Can't get a key on uid text."
+                                       " You must supply a keyid.");
+                       } else if (fetch_key(keyid, &keys, false)) {

                                logthing(LOGTHING_INFO, "Got key.");
                                flatten_publickey(keys,
                                                &packets,
                                                &list_end);
                                logthing(LOGTHING_INFO, "Got key.");
                                flatten_publickey(keys,
                                                &packets,
                                                &list_end);

+                               free_publickey(keys);

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