Switch debian build system to dh

[onak.git] / splitkeys.c

diff --git a/splitkeys.c b/splitkeys.c
index fdc20a288dfb1250a5ce218ab647714fc495d98d..2a91d2faeac75fdd2eeb480126d67ead9a68786f 100644 (file)
--- a/splitkeys.c
+++ b/splitkeys.c
@@ -25,9 +25,7 @@
 
 #include "charfuncs.h"
 #include "keystructs.h"
 
 #include "charfuncs.h"
 #include "keystructs.h"

-#include "log.h"

 #include "mem.h"
 #include "mem.h"

-#include "onak-conf.h"

 #include "openpgp.h"
 #include "parsekey.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;
        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;
        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 {
        do {

-               result = read_openpgp_stream(stdin_getchar, NULL,
+               read_openpgp_stream(stdin_getchar, NULL,

                                 &packets, maxkeys);
                if (packets != NULL) {
                        list_end = packets;
                                 &packets, maxkeys);
                if (packets != NULL) {
                        list_end = packets;


@@ -69,7 +63,7 @@ int main(int argc, char *argv[])
                                        tmp->next = NULL;
                                }
                        }
                                        tmp->next = NULL;
                                }
                        }

-                       if (tmp->next != NULL) {
+                       if (tmp != NULL && tmp->next != NULL) {

                                list_end = NULL;
                        }
 
                                list_end = NULL;
                        }
 


@@ -84,8 +78,5 @@ int main(int argc, char *argv[])
                }
        } while (packets != NULL);
 
                }
        } while (packets != NULL);
 

-       cleanuplogthing();
-       cleanupconfig();
-

        return 0;
 }
        return 0;
 }