Explicitly use 32 bits for keyd socket commands

[onak.git] / splitkeys.c

diff --git a/splitkeys.c b/splitkeys.c
index a2daac673bbe1a6c2f13dc751deed7dc68921b35..73a94cddc42a4f396e9e835aeab6bb45748fb07b 100644 (file)
--- a/splitkeys.c
+++ b/splitkeys.c
@@ -4,8 +4,6 @@
  * Jonathan McDowell <noodles@earth.li>
  * 
  * Copyright 2003 Project Purple
  * Jonathan McDowell <noodles@earth.li>
  * 
  * Copyright 2003 Project Purple

- *
- * $Id: splitkeys.c,v 1.1 2003/09/30 21:16:14 noodles Exp $

  */
 
 #include <fcntl.h>
  */
 
 #include <fcntl.h>


@@ -16,7 +14,9 @@
 
 #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 "parsekey.h"
 
 int main(int argc, char *argv[])
 #include "parsekey.h"
 
 int main(int argc, char *argv[])


@@ -36,10 +36,13 @@ int main(int argc, char *argv[])
                        fprintf(stderr,
                                "Couldn't parse %s as a number of keys!\n",
                                argv[1]);
                        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,
                                 &packets, maxkeys);
        do {
                result = read_openpgp_stream(stdin_getchar, NULL,
                                 &packets, maxkeys);


@@ -53,6 +56,9 @@ int main(int argc, char *argv[])
                                        tmp->next = NULL;
                                }
                        }
                                        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);
 
                        snprintf(splitfile, 1023, "splitfile-%d.pgp", count);
                        outfd = open(splitfile, O_WRONLY | O_CREAT, 0664);


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

+       cleanuplogthing();
+       cleanupconfig();
+

        return 0;
 }
        return 0;
 }