cscvs to tla changeset 113

[onak.git] / main.c

diff --git a/main.c b/main.c
index c7bfe28d5fc0b70357e7c257b8f685eb1da0e6fe..58e3ca743a44fec7e3362eefffdbaac50b0281e8 100644 (file)
--- a/main.c
+++ b/main.c
@@ -4,57 +4,50 @@
 #include <unistd.h>
 
 #include "armor.h"
+#include "charfuncs.h"
 #include "keydb.h"
 #include "keyid.h"
 #include "keyindex.h"
 #include "keystructs.h"
 #include "parsekey.h"
 
-int getnextchar(void *ctx, size_t count, unsigned char *c)
-{
-        return (!read(0, c, count));
-}
-
-int putnextchar(void *ctx, size_t count, unsigned char *c)
-{
-        return (!write(1, c, count));
-}
-
-
 int main(int argc, char *argv[])
 {
-       struct openpgp_packet_list *packets = NULL; //, *newpackets = NULL;
-//     struct openpgp_packet_list *list_end = NULL;
-//     struct openpgp_publickey *keys = NULL;
-//     struct openpgp_publickey *newkeys = NULL;
-//     void *ctx = NULL;
-
-//     fputs("Doing read_openpgp_stream():\n", stderr);
-//     read_openpgp_stream(getnextchar, ctx, &packets);
-
+       struct openpgp_packet_list *packets = NULL; 
+/*
+       , *newpackets = NULL;
+       struct openpgp_packet_list *list_end = NULL;
+       struct openpgp_publickey *keys = NULL;
+       struct openpgp_publickey *newkeys = NULL;
+       void *ctx = NULL;
+
+       fputs("Doing read_openpgp_stream():\n", stderr);
+       read_openpgp_stream(getnextchar, ctx, &packets, 0);
+*/
        fputs("Doing dearmor_openpgp_stream():\n", stderr);
-       dearmor_openpgp_stream(getnextchar, NULL, &packets);
+       dearmor_openpgp_stream(stdin_getchar, NULL, &packets);
        fputs("Doing armor_openpgp_stream():\n", stderr);
-       armor_openpgp_stream(putnextchar, NULL, packets);
-
-//     fputs("Doing parse_keys():\n", stderr);
-//     parse_keys(packets, &keys);
+       armor_openpgp_stream(stdout_putchar, NULL, packets);
 
-//     printf("Key id is 0x%llX\n", get_keyid(keys));
+/*
+       fputs("Doing parse_keys():\n", stderr);
+       parse_keys(packets, &keys);
 
-//     key_index(keys, true, false, false);
+       printf("Key id is 0x%llX\n", get_keyid(keys));
 
-//     initdb();
-//     fetch_key(get_keyid(keys), &newkeys);
-//     cleanupdb();
+       key_index(keys, true, false, false);
 
-//     printf("New key id is 0x%llX\n", get_keyid(newkeys));
+       initdb();
+       fetch_key(get_keyid(keys), &newkeys);
+       cleanupdb();
 
-//     fputs("Doing flatten_publickey():\n", stderr);
-//     flatten_publickey(keys, &newpackets, &list_end);
+       printf("New key id is 0x%llX\n", get_keyid(newkeys));
 
-//     fputs("Doing write_openpgp_stream():\n", stderr);
-//     write_openpgp_stream(putnextchar, ctx, newpackets);
+       fputs("Doing flatten_publickey():\n", stderr);
+       flatten_publickey(keys, &newpackets, &list_end);
 
+       fputs("Doing write_openpgp_stream():\n", stderr);
+       write_openpgp_stream(putnextchar, ctx, newpackets);
+*/
        return 0;
 }