--- ray/src/hd/rholo.c	1997/12/02 12:29:17	3.15
+++ ray/src/hd/rholo.c	1997/12/08 18:51:15	3.17
@@ -30,6 +30,8 @@ int	ncprocs = 0;		/* desired number of compute process
 
 char	*outdev = NULL;		/* output device name */
 
+int	readinp = 0;		/* read commands from stdin */
+
 time_t	starttime;		/* time we got started */
 time_t	endtime;		/* time we should end by */
 time_t	reporttime;		/* time for next report */
@@ -70,6 +72,9 @@ char	*argv[];
 		case 'f':			/* force overwrite */
 			force++;
 			break;
+		case 'i':			/* read input from stdin */
+			readinp++;
+			break;
 		case 'n':			/* compute processes */
 			if (i >= argc-2)
 				goto userr;
@@ -187,6 +192,8 @@ initrholo()			/* get our holodeck running */
 {
 	extern int	global_packet();
 	register int	i;
+						/* close holodeck on exec() */
+	fcntl(hdlist[0]->fd, F_SETFD, FD_CLOEXEC);
 
 	if (outdev != NULL)			/* open output device */
 		disp_open(outdev);
@@ -363,12 +370,14 @@ register HDGRID	*gp;
 	if (gp == NULL)		/* already initialized? */
 		return;
 				/* set grid parameters */
+	gp->grid[0] = gp->grid[1] = gp->grid[2] = 0;
 	if (sscanf(vval(SECTION),
-			"%lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf",
+		"%lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %hd %hd %hd",
 			&gp->orig[0], &gp->orig[1], &gp->orig[2],
 			&gp->xv[0][0], &gp->xv[0][1], &gp->xv[0][2],
 			&gp->xv[1][0], &gp->xv[1][1], &gp->xv[1][2],
-			&gp->xv[2][0], &gp->xv[2][1], &gp->xv[2][2]) != 12)
+			&gp->xv[2][0], &gp->xv[2][1], &gp->xv[2][2],
+			&gp->grid[0], &gp->grid[1], &gp->grid[2]) < 12)
 		badvalue(SECTION);
 	maxlen = 0.;
 	for (i = 0; i < 3; i++)
@@ -382,7 +391,8 @@ register HDGRID	*gp;
 	if ((d = vflt(GRID)) <= FTINY)
 		badvalue(GRID);
 	for (i = 0; i < 3; i++)
-		gp->grid[i] = len[i]/d + (1.-FTINY);
+		if (gp->grid[i] <= 0)
+			gp->grid[i] = len[i]/d + (1.-FTINY);
 }