X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/5e1b22d763640c4d7a09d07920403d8d491b4410..refs/heads/switch-to-debhelper:/splitkeys.c?ds=sidebyside

diff --git a/splitkeys.c b/splitkeys.c
index fdc20a2..2a91d2f 100644
--- a/splitkeys.c
+++ b/splitkeys.c
@@ -25,9 +25,7 @@
 
 #include "charfuncs.h"
 #include "keystructs.h"
-#include "log.h"
 #include "mem.h"
-#include "onak-conf.h"
 #include "openpgp.h"
 #include "parsekey.h"
 
@@ -36,7 +34,6 @@ int main(int argc, char *argv[])
 	struct openpgp_packet_list	*packets = NULL;
 	struct openpgp_packet_list	*list_end = NULL;
 	struct openpgp_packet_list	*tmp = NULL;
-	int				 result = 0;
 	int				 maxkeys = 10000;
 	int				 outfd = -1;
 	int				 count = 0;
@@ -52,11 +49,8 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	readconfig(NULL);
-	initlogthing("splitkeys", config.logfile);
-
 	do {
-		result = read_openpgp_stream(stdin_getchar, NULL,
+		read_openpgp_stream(stdin_getchar, NULL,
 				 &packets, maxkeys);
 		if (packets != NULL) {
 			list_end = packets;
@@ -69,7 +63,7 @@ int main(int argc, char *argv[])
 					tmp->next = NULL;
 				}
 			}
-			if (tmp->next != NULL) {
+			if (tmp != NULL && tmp->next != NULL) {
 				list_end = NULL;
 			}
 
@@ -84,8 +78,5 @@ int main(int argc, char *argv[])
 		}
 	} while (packets != NULL);
 
-	cleanuplogthing();
-	cleanupconfig();
-
 	return 0;
 }