X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/4843e5290f2e7060ca5777c64b96e680080644f2..666b0d041ecf22f2b4936d3b04a98e5807f55877:/splitkeys.c

diff --git a/splitkeys.c b/splitkeys.c
index a2daac6..76aa4e4 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.1 2003/09/30 21:16:14 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,7 +25,10 @@
 
 #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[])
@@ -24,7 +36,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;
@@ -36,12 +47,15 @@ int main(int argc, char *argv[])
 			fprintf(stderr,
 				"Couldn't parse %s as a number of keys!\n",
 				argv[1]);
-			exit(1);
+			exit(EXIT_FAILURE);
 		}
 	}
 
+	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;
@@ -49,10 +63,14 @@ 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) {
+				list_end = NULL;
+			}
 
 			snprintf(splitfile, 1023, "splitfile-%d.pgp", count);
 			outfd = open(splitfile, O_WRONLY | O_CREAT, 0664);
@@ -65,5 +83,8 @@ int main(int argc, char *argv[])
 		}
 	} while (packets != NULL);
 
+	cleanuplogthing();
+	cleanupconfig();
+
 	return 0;
 }