X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/5b3f77c7fbafb036d20a1577ed74f475e94ed821..5519cde50874ecd006e5ebf2421b1c7d48de0072:/onak.c

diff --git a/onak.c b/onak.c
index 3a6f62f..e6b9287 100644
--- a/onak.c
+++ b/onak.c
@@ -74,7 +74,7 @@ void dump_func(void *ctx, struct openpgp_publickey *key)
 
 	state = (struct dump_ctx *) ctx;
 
-	if (state->fd == -1 || state->count > state->maxcount) {
+	if (state->fd == -1 || state->count++ > state->maxcount) {
 		if (state->fd != -1) {
 			close(state->fd);
 			state->fd = -1;
@@ -161,7 +161,7 @@ int main(int argc, char *argv[])
 	} else if (!strcmp("dump", argv[optind])) {
 		config.dbbackend->initdb(true);
 		dumpstate.count = dumpstate.filenum = 0;
-		dumpstate.maxcount = 1000000;
+		dumpstate.maxcount = 100000;
 		dumpstate.fd = -1;
 		dumpstate.filebase = "keydump.%d.pgp";
 		config.dbbackend->iterate_keys(dump_func, &dumpstate);
@@ -322,9 +322,15 @@ int main(int argc, char *argv[])
 						&packets,
 						&list_end);
 				free_publickey(keys);
-				armor_openpgp_stream(stdout_putchar,
+				if (binary) {
+					write_openpgp_stream(stdout_putchar,
 						NULL,
 						packets);
+				} else {
+					armor_openpgp_stream(stdout_putchar,
+						NULL,
+						packets);
+				}
 				free_packet_list(packets);
 				packets = NULL;
 			} else {