 @@ -1,14 +1,14 @@
-/* $NetBSD: master.c,v 1.8 2009/01/31 23:25:38 joerg Exp $ */
+/* $NetBSD: master.c,v 1.9 2013/01/14 14:33:28 jperkin Exp $ */
 /*-
  * Copyright (c) 2007, 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
  * All rights reserved.
+ *
  * This code was developed as part of Google's Summer of Code 2007 program.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -25,34 +25,32 @@
  * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <nbcompat.h>
 #include <nbcompat/types.h>
 #include <sys/ioctl.h>
 #ifdef __sun
 #include <sys/filio.h>
 #endif
 #include <nbcompat/queue.h>
 #include <sys/socket.h>
 #include <nbcompat/time.h>
 #include <sys/wait.h>
 #include <nbcompat/err.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <nbcompat/stdlib.h>
 #include <nbcompat/stdio.h>
 #include <nbcompat/string.h>
 #include <arpa/inet.h>
 #include "pbulk.h"
 #include "pbuild.h"
 static int clients_started;
 static LIST_HEAD(, build_peer) active_peers, inactive_peers, unassigned_peers;
 static struct event listen_event;
 @@ -298,30 +296,28 @@ master_mode(const char *master_port, con
 	LIST_INIT(&active_peers);
 	LIST_INIT(&inactive_peers);
 	LIST_INIT(&unassigned_peers);
 	event_init();
 	if (parse_sockaddr_in(master_port, &dst))
 		errx(1, "Could not parse addr/port");
 	fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 	if (fd == -1)
 		err(1, "Could not create socket");
-#ifdef FIOCLEX
+	if (fcntl(fd, F_SETFD, FD_CLOEXEC) == -1)
 	if (ioctl(fd, FIOCLEX, NULL) == -1)
 		err(1, "Could not set close-on-exec flag");
 #endif
 	if (bind(fd, (struct sockaddr *)&dst, sizeof(dst)) == -1)
 		err(1, "Could not bind socket");
 	if (listen(fd, 5) == -1)
 		err(1, "Could not listen on socket");
 	event_add(&listen_event, fd, 0, 1, listen_handler, NULL);
 	listen_event_socket = fd;
 	if (start_script) {
 		signal_add(&child_event, SIGCHLD, child_handler);
 		if ((child_pid = vfork()) == 0) {
 			execlp(start_script, start_script, (char *)NULL);

 @@ -1,14 +1,14 @@
-/* $NetBSD: pbuild.c,v 1.5 2007/08/05 14:15:55 joerg Exp $ */
+/* $NetBSD: pbuild.c,v 1.6 2013/01/14 14:33:28 jperkin Exp $ */
 /*-
  * Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
  * All rights reserved.
+ *
  * This code was developed as part of Google's Summer of Code 2007 program.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -164,26 +164,27 @@ main(int argc, char **argv)
 		master_mode(master_port, start_script);
 	else
 		standalone_mode();
 	if (report_file)
 		finish_build(report_file);
 	return 0;
+}
 int
 build_package(const char *build_info, size_t len)
+{
 	struct sigaction sa;
 	int input[2];
 	pid_t child;
 	if (pipe(input) == -1)
 		err(1, "Failed to create pipe");
 	child = vfork();
 	if (child == -1)
 		err(1, "Failed to create child");
 	if (child != 0) {
 		ssize_t bytes_written;
 		const char *begin;
 		size_t bytes_left;
 @@ -200,26 +201,35 @@ build_package(const char *build_info, si
 				(void)close(input[1]);
 				(void)kill(child, SIGTERM);
 				(void)waitpid(child, &ret, 0);
 				return 1;
+			}
 			bytes_left -= bytes_written;
 			begin += bytes_written;
+		}
 		(void)close(input[1]);
 		(void)waitpid(child, &ret, 0);
 		return ret;
+	}
 	/* Reset SIGPIPE handling for child */
 #if !defined(__INTERIX)
 	sa.sa_sigaction = NULL;
 #endif
 	sa.sa_handler = SIG_DFL;
 	sa.sa_flags = 0;
 	(void)sigemptyset(&sa.sa_mask);
 	(void)sigaction(SIGPIPE, (struct sigaction *)&sa, NULL);
 	(void)close(input[1]);
 	if (dup2(input[0], 0) == -1) {
 		const char err_msg[] = "dup failed for stdin\n";
 		(void)write(STDERR_FILENO, err_msg, sizeof(err_msg) - 1);
 		_exit(255);
+	}
 	(void)execl(build_path, build_cmd, (char *)NULL);
 	_exit(255);
+}
 static void

 @@ -1,14 +1,14 @@
-/* $NetBSD: master.c,v 1.7 2009/01/31 23:25:38 joerg Exp $ */
+/* $NetBSD: master.c,v 1.8 2013/01/14 14:33:28 jperkin Exp $ */
 /*-
  * Copyright (c) 2007, 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
  * All rights reserved.
+ *
  * This code was developed as part of Google's Summer of Code 2007 program.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -26,34 +26,32 @@
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <nbcompat.h>
 #include <nbcompat/types.h>
 #include <nbcompat/queue.h>
 #include <sys/ioctl.h>
 #ifdef __sun
 #include <sys/filio.h>
 #endif
 #include <sys/socket.h>
 #include <nbcompat/time.h>
 #include <sys/wait.h>
 #include <nbcompat/err.h>
 #include <signal.h>
 #include <fcntl.h>
 #include <nbcompat/stdlib.h>
 #include <nbcompat/stdio.h>
 #include <nbcompat/string.h>
 #include <arpa/inet.h>
 #include "pbulk.h"
 #include "pscan.h"
 static int clients_started;
 static LIST_HEAD(, scan_peer) active_peers, inactive_peers;
 static struct event listen_event;
 static int listen_event_socket;
 @@ -249,30 +247,28 @@ master_mode(const char *master_port, con
 	int fd;
 	LIST_INIT(&active_peers);
 	LIST_INIT(&inactive_peers);
 	event_init();
 	if (parse_sockaddr_in(master_port, &dst))
 		errx(1, "Could not parse addr/port");
 	fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 	if (fd == -1)
 		err(1, "Could not create socket");
-#ifdef FIOCLEX
+	if (fcntl(fd, F_SETFD, FD_CLOEXEC) == -1)
 	if (ioctl(fd, FIOCLEX, NULL) == -1)
 		err(1, "Could not set close-on-exec flag");
 #endif
 	if (bind(fd, (struct sockaddr *)&dst, sizeof(dst)) == -1)
 		err(1, "Could not bind socket");
 	if (listen(fd, 5) == -1)
 		err(1, "Could not listen on socket");
 	event_add(&listen_event, fd, 0, 1, listen_handler, NULL);
 	listen_event_socket = fd;
 	if (start_script) {
 		signal_add(&child_event, SIGCHLD, child_handler);
 		if ((child_pid = vfork()) == 0) {
 			execlp(start_script, start_script, (char *)NULL);

 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.10 2012/11/23 12:13:35 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2013/01/14 14:33:29 jperkin Exp $
-DISTNAME=	pbulk-base-0.46
+DISTNAME=	pbulk-base-0.47
 COMMENT=	Core components of the modular bulk build framework
 .include "../../pkgtools/pbulk/Makefile.common"
 USE_FEATURES=	nbcompat
 USE_TOOLS+=	groff nroff
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
 USE_BSD_MAKEFILE=	yes
 CONFLICTS=	pbulk<0.39
 .include "../../mk/bsd.prefs.mk"