X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=main.c;h=b140c8edc9b7ac3740a50a834329f98aa003b5da;hb=2ffd5444d8c7a73b12039f3a6cf336872f2558c4;hp=33b193d7a458fd8afe500298548360771f0916d5;hpb=8e58a1769ce5e492dd68904dfc81b6e077fc2a3a;p=onak.git

diff --git a/main.c b/main.c
index 33b193d..b140c8e 100644
--- a/main.c
+++ b/main.c
@@ -15,46 +15,49 @@ int getnextchar(void *ctx, size_t count, unsigned char *c)
         return (!read(0, c, count));
 }
 
-int putnextchar(void *ctx, unsigned char c)
+int putnextchar(void *ctx, size_t count, unsigned char *c)
 {
-        return (!write(1, &c, 1));
+        return (!write(1, c, count));
 }
 
 
 int main(int argc, char *argv[])
 {
-	struct openpgp_packet_list *packets = NULL, *newpackets = NULL;
+	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);
-
+	fputs("Doing read_openpgp_stream():\n", stderr);
+	read_openpgp_stream(getnextchar, ctx, &packets);
+*/
 	fputs("Doing dearmor_openpgp_stream():\n", stderr);
 	dearmor_openpgp_stream(getnextchar, 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);
-
-//	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;
 }