--- ray/src/rt/raypcalls.c	2004/09/17 21:43:50	2.8
+++ ray/src/rt/raypcalls.c	2005/12/17 22:17:51	2.12
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: raypcalls.c,v 2.8 2004/09/17 21:43:50 greg Exp $";
+static const char	RCSid[] = "$Id: raypcalls.c,v 2.12 2005/12/17 22:17:51 greg Exp $";
 #endif
 /*
  *  raypcalls.c - interface for parallel rendering using Radiance
@@ -43,7 +43,7 @@ static const char	RCSid[] = "$Id: raypcalls.c,v 2.8 20
  *	myRay.rorg = ( ray origin point )
  *	myRay.rdir = ( normalized ray direction )
  *	myRay.rmax = ( maximum length, or zero for no limit )
- *	rayorigin(&myRay, NULL, PRIMARY, 1.0);
+ *	rayorigin(&myRay, PRIMARY, NULL, NULL);
  *	myRay.rno = ( my personal ray identifier )
  *	if (ray_pqueue(&myRay) == 1)
  *		{ do something with results }
@@ -402,27 +402,25 @@ ray_pchild(	/* process rays (never returns) */
 					/* read each ray request set */
 	while ((n = read(fd_in, (char *)r_queue, sizeof(r_queue))) > 0) {
 		int	n2;
-		if (n % sizeof(RAY))
+		if (n < sizeof(RAY))
 			break;
-		n /= sizeof(RAY);
 					/* get smuggled set length */
-		n2 = r_queue[0].crtype - n;
+		n2 = sizeof(RAY)*r_queue[0].crtype - n;
 		if (n2 < 0)
 			error(INTERNAL, "buffer over-read in ray_pchild");
 		if (n2 > 0) {		/* read the rest of the set */
-			i = readbuf(fd_in, (char *)(r_queue+n),
-					sizeof(RAY)*n2);
-			if (i != sizeof(RAY)*n2)
+			i = readbuf(fd_in, (char *)r_queue + n, n2);
+			if (i != n2)
 				break;
 			n += n2;
 		}
+		n /= sizeof(RAY);
 					/* evaluate rays */
 		for (i = 0; i < n; i++) {
 			r_queue[i].crtype = r_queue[i].rtype;
 			r_queue[i].parent = NULL;
 			r_queue[i].clipset = NULL;
 			r_queue[i].slights = NULL;
-			r_queue[i].revf = raytrace;
 			samplendx++;
 			rayclear(&r_queue[i]);
 			rayvalue(&r_queue[i]);
@@ -468,6 +466,12 @@ ray_popen(			/* open the specified # processes */
 		if (r_proc[ray_pnprocs].pid < 0)
 			error(SYSTEM, "cannot fork child process");
 		close(p1[0]); close(p0[1]);
+		/*
+		 * Close write stream on exec to avoid multiprocessing deadlock.
+		 * No use in read stream without it, so set flag there as well.
+		 */
+		fcntl(p1[1], F_SETFD, FD_CLOEXEC);
+		fcntl(p0[0], F_SETFD, FD_CLOEXEC);
 		r_proc[ray_pnprocs].fd_send = p1[1];
 		r_proc[ray_pnprocs].fd_recv = p0[0];
 		r_proc[ray_pnprocs].npending = 0;