--- ray/src/hd/rholo.c	1997/12/12 18:12:40	3.21
+++ ray/src/hd/rholo.c	1997/12/12 18:23:08	3.22
@@ -10,7 +10,6 @@ static char SCCSid[] = "$SunId$ SGI";
 
 #include "rholo.h"
 #include "random.h"
-#include "paths.h"
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -22,7 +21,7 @@ VARIABLE	vv[] = RHVINIT;		/* variable-value pairs */
 
 char	*progname;		/* our program name */
 char	*hdkfile;		/* holodeck file name */
-char	froot[MAXPATH];		/* root file name */
+char	froot[256];		/* root file name */
 
 int	nowarn = 0;		/* turn warnings off? */
 
@@ -107,8 +106,7 @@ char	*argv[];
 							/* check settings */
 		checkvalues();
 							/* load RIF if any */
-		if (vdef(RIF))
-			getradfile(vval(RIF));
+		getradfile();
 							/* set defaults */
 		setdefaults(&hdg);
 							/* holodeck exists? */
@@ -122,8 +120,7 @@ char	*argv[];
 							/* check settings */
 		checkvalues();
 							/* load RIF if any */
-		if (vdef(RIF))
-			getradfile(vval(RIF));
+		getradfile();
 							/* set defaults */
 		setdefaults(NULL);
 	}
@@ -513,98 +510,13 @@ PACKET	*pl;
 }
 
 
-int
-done_rtrace()			/* clean up and close rtrace calculation */
-{
-	int	status;
-					/* already closed? */
-	if (!nprocs)
-		return;
-					/* report activity */
-	wputs("closing rtrace process...\n");
-					/* flush beam queue */
-	done_packets(flush_queue());
-					/* close rtrace */
-	if ((status = end_rtrace()))
-		error(WARNING, "bad exit status from rtrace");
-	if (vdef(REPORT))		/* report time */
-		report(0);
-	return(status);			/* return status */
-}
-
-
-new_rtrace()			/* restart rtrace calculation */
-{
-	char	combuf[128];
-
-	if (nprocs > 0)			/* already running? */
-		return;
-	wputs("restarting rtrace process...\n");
-	if (vdef(RIF)) {		/* rerun rad to update octree */
-		sprintf(combuf, "rad -v 0 -s -w %s", vval(RIF));
-		if (system(combuf))
-			error(WARNING, "error running rad");
-	}
-	if (start_rtrace() < 1)		/* start rtrace */
-		error(WARNING, "cannot restart rtrace");
-	else if (vdef(REPORT))
-		report(0);
-}
-
-
-getradfile(rfargs)		/* run rad and get needed variables */
-char	*rfargs;
-{
-	static short	mvar[] = {OCTREE,-1};
-	static char	tf1[] = TEMPLATE;
-	char	tf2[64];
-	char	combuf[256];
-	char	*pippt;
-	register int	i;
-	register char	*cp;
-					/* create rad command */
-	mktemp(tf1);
-	sprintf(tf2, "%s.rif", tf1);
-	sprintf(combuf,
-		"rad -v 0 -s -e -w %s OPTFILE=%s | egrep '^[ \t]*(NOMATCH",
-			rfargs, tf1);
-	cp = combuf;
-	while (*cp){
-		if (*cp == '|') pippt = cp;
-		cp++;
-	}				/* match unset variables */
-	for (i = 0; mvar[i] >= 0; i++)
-		if (!vdef(mvar[i])) {
-			*cp++ = '|';
-			strcpy(cp, vnam(mvar[i]));
-			while (*cp) cp++;
-			pippt = NULL;
-		}
-	if (pippt != NULL)
-		strcpy(pippt, "> /dev/null");	/* nothing to match */
-	else
-		sprintf(cp, ")[ \t]*=' > %s", tf2);
-	if (system(combuf)) {
-		unlink(tf2);			/* clean up */
-		unlink(tf1);
-		error(SYSTEM, "cannot execute rad command");
-	}
-	if (pippt == NULL) {
-		loadvars(tf2);			/* load variables */
-		unlink(tf2);
-	}
-	rtargc += wordfile(rtargv+rtargc, tf1);	/* get rtrace options */
-	unlink(tf1);			/* clean up */
-}
-
-
 rootname(rn, fn)		/* remove tail from end of fn */
 register char	*rn, *fn;
 {
 	char	*tp, *dp;
 
 	for (tp = NULL, dp = rn; *rn = *fn++; rn++)
-		if (ISDIRSEP(*rn))
+		if (*rn == '/')
 			dp = rn;
 		else if (*rn == '.')
 			tp = rn;