X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/7f046503b8b8dcec51c1f7752e87ba0ba0af0631..refs/heads/switch-to-debhelper:/splitkeys.c

diff --git a/splitkeys.c b/splitkeys.c
index 7fe66fa..2a91d2f 100644
--- a/splitkeys.c
+++ b/splitkeys.c
@@ -1,11 +1,20 @@
 /*
  * splitkeys.c - Split a keyring into smaller chunks.
  *
- * Jonathan McDowell <noodles@earth.li>
- * 
- * Copyright 2003 Project Purple
+ * Copyright 2003 Jonathan McDowell <noodles@earth.li>
  *
- * $Id: splitkeys.c,v 1.4 2003/10/15 21:15:21 noodles Exp $
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include <fcntl.h>
@@ -16,9 +25,8 @@
 
 #include "charfuncs.h"
 #include "keystructs.h"
-#include "log.h"
 #include "mem.h"
-#include "onak-conf.h"
+#include "openpgp.h"
 #include "parsekey.h"
 
 int main(int argc, char *argv[])
@@ -26,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;
@@ -42,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;
@@ -54,11 +58,12 @@ int main(int argc, char *argv[])
 				tmp = list_end;
 				list_end = list_end->next;
 				if (list_end->next == NULL &&
-					list_end->packet->tag == 6) {
+					list_end->packet->tag ==
+						OPENPGP_PACKET_PUBLICKEY) {
 					tmp->next = NULL;
 				}
 			}
-			if (tmp->next != NULL) {
+			if (tmp != NULL && tmp->next != NULL) {
 				list_end = NULL;
 			}
 
@@ -73,8 +78,5 @@ int main(int argc, char *argv[])
 		}
 	} while (packets != NULL);
 
-	cleanuplogthing();
-	cleanupconfig();
-
 	return 0;
 }