X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/0211c730256c9bbaf10a569c88f7df0ef882311e..refs/heads/switch-to-debhelper:/splitkeys.c diff --git a/splitkeys.c b/splitkeys.c index 86a8363..2a91d2f 100644 --- a/splitkeys.c +++ b/splitkeys.c @@ -1,9 +1,20 @@ /* * splitkeys.c - Split a keyring into smaller chunks. * - * Jonathan McDowell - * - * Copyright 2003 Project Purple + * Copyright 2003 Jonathan McDowell + * + * 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 @@ -14,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" @@ -25,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; @@ -41,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; @@ -58,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; } @@ -73,8 +78,5 @@ int main(int argc, char *argv[]) } } while (packets != NULL); - cleanuplogthing(); - cleanupconfig(); - return 0; }