--- ray/src/hd/rholo.c	1997/12/04 10:30:33	3.16
+++ ray/src/hd/rholo.c	1997/12/12 11:13:16	3.20
@@ -30,6 +30,10 @@ int	ncprocs = 0;		/* desired number of compute process
 
 char	*outdev = NULL;		/* output device name */
 
+int	readinp = 0;		/* read commands from stdin */
+
+int	force = 0;		/* allow overwrite of holodeck */
+
 time_t	starttime;		/* time we got started */
 time_t	endtime;		/* time we should end by */
 time_t	reporttime;		/* time for next report */
@@ -57,10 +61,9 @@ char	*argv[];
 {
 	HDGRID	hdg;
 	int	i;
-	int	force = 0;
 						/* mark start time */
 	starttime = time(NULL);
-	initurand(10240);			/* initialize urand */
+	initurand(16384);			/* initialize urand */
 	progname = argv[0];			/* get arguments */
 	for (i = 1; i < argc && argv[i][0] == '-'; i++)
 		switch (argv[i][1]) {
@@ -70,6 +73,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 +193,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);
@@ -217,7 +225,7 @@ initrholo()			/* get our holodeck running */
 	if (ncprocs > 0) {
 		i = start_rtrace();
 		if (i < 1)
-			error(USER, "cannot start rtrace process");
+			error(USER, "cannot start rtrace process(es)");
 		if (vdef(REPORT)) {		/* make first report */
 			printargs(rtargc, rtargv, stderr);
 			report(0);
@@ -272,7 +280,7 @@ rholo()				/* holodeck main loop */
 		if (!disp_check(idle))
 			return(0);
 					/* display only? */
-	if (ncprocs <= 0)
+	if (nprocs <= 0)
 		return(1);
 					/* check file size */
 	if (maxdisk > 0 && hdfilen(hdlist[0]->fd) >= maxdisk) {
@@ -493,13 +501,25 @@ PACKET	*pl;
 		p->next = freepacks;
 		freepacks = p;
 	}
-	if (n2flush > 512*RPACKSIZ*ncprocs) {
+	if (n2flush > 512*RPACKSIZ*nprocs) {
 		hdflush(NULL);			/* flush holodeck buffers */
 		n2flush = 0;
 	}
 }
 
 
+checkrad()			/* check to make sure octree is up to date */
+{
+	char	combuf[128];
+
+	if (!vdef(RIF))
+		return;
+	sprintf(combuf, "rad -v 0 -s -w %s", vval(RIF));
+	if (system(combuf))
+		error(WARNING, "error running rad");
+}
+
+
 getradfile(rfargs)		/* run rad and get needed variables */
 char	*rfargs;
 {
@@ -533,10 +553,9 @@ char	*rfargs;
 	else
 		sprintf(cp, ")[ \t]*=' > %s", tf2);
 	if (system(combuf)) {
-		error(SYSTEM, "cannot execute rad command");
 		unlink(tf2);			/* clean up */
 		unlink(tf1);
-		quit(1);
+		error(SYSTEM, "cannot execute rad command");
 	}
 	if (pippt == NULL) {
 		loadvars(tf2);			/* load variables */
@@ -603,22 +622,21 @@ int	ec;
 	int	status = 0;
 
 	if (hdlist[0] != NULL) {	/* flush holodeck */
-		if (ncprocs > 0) {
+		if (nprocs > 0) {
 			done_packets(flush_queue());
 			status = end_rtrace();	/* close rtrace */
-			hdflush(NULL);
-			if (vdef(REPORT)) {
-				long	fsiz, fuse;
-				report(0);
-				fsiz = hdfilen(hdlist[0]->fd);
-				fuse = hdfiluse(hdlist[0]->fd, 1);
-				fprintf(stderr,
+		}
+		hdflush(NULL);
+		if (ncprocs > 0 && vdef(REPORT)) {
+			long	fsiz, fuse;
+			report(0);
+			fsiz = hdfilen(hdlist[0]->fd);
+			fuse = hdfiluse(hdlist[0]->fd, 1);
+			fprintf(stderr,
 			"%s: %.1f Mbyte holodeck file, %.1f%% fragmentation\n",
-						hdkfile, fsiz/(1024.*1024.),
-						100.*(fsiz-fuse)/fsiz);
-			}
-		} else
-			hdflush(NULL);
+					hdkfile, fsiz/(1024.*1024.),
+					100.*(fsiz-fuse)/fsiz);
+		}
 	}
 	if (orig_mode >= 0)		/* reset holodeck access mode */
 		fchmod(hdlist[0]->fd, orig_mode);