Export find_packet from merge.c

[onak.git] / sendsync.c

diff --git a/sendsync.c b/sendsync.c
index 568ba3fcc586eb346ca7daeb89addcb7fde90246..53ea713cafbd362b32bc484c49a501cd26c3306a 100644 (file)
--- a/sendsync.c
+++ b/sendsync.c
@@ -1,9 +1,20 @@
 /*
  * sendsync.c - Routines to send a key sync mail.
  *
 /*
  * sendsync.c - Routines to send a key sync mail.
  *

- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 1999, 2002, 2005, 2011 Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 1999, 2002 Project Purple
+ * 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 <stdio.h>
  */
 
 #include <stdio.h>


@@ -19,13 +30,10 @@
 #include "parsekey.h"
 #include "sendsync.h"
 
 #include "parsekey.h"
 #include "sendsync.h"
 

-int fd_putchar(void *ctx, size_t count, unsigned char *c)
+int fd_putchar(void *ctx, size_t count, void *c)

 {
 {

-       int i;
+       fwrite(c, sizeof(char), count, ctx);

 
 

-       for (i = 0; i < count; i++) {
-               fputc(c[i], ctx);
-       }

        return 0;
 }
 
        return 0;
 }
 


@@ -43,7 +51,7 @@ int sendkeysync(struct openpgp_publickey *keys)
        struct openpgp_packet_list *list_end = NULL;
 
        if (config.syncsites != NULL &&
        struct openpgp_packet_list *list_end = NULL;
 
        if (config.syncsites != NULL &&

-                       (fd=popen("sendmail -t", "w")) != NULL) {
+                       (fd=popen(config.mta, "w")) != NULL) {

                fprintf(fd, "From: %s\n", config.adminemail);
 
                fprintf(fd, "To: ");
                fprintf(fd, "From: %s\n", config.adminemail);
 
                fprintf(fd, "To: ");