--- ray/src/hd/rholo2.c 1997/12/15 21:04:24 3.9 +++ ray/src/hd/rholo2.c 1998/07/06 18:17:20 3.13 @@ -1,4 +1,4 @@ -/* Copyright (c) 1997 Silicon Graphics, Inc. */ +/* Copyright (c) 1998 Silicon Graphics, Inc. */ #ifndef lint static char SCCSid[] = "$SunId$ SGI"; @@ -82,7 +82,7 @@ done_rtrace() /* clean up and close rtrace calculati if ((status = end_rtrace())) error(WARNING, "bad exit status from rtrace"); if (vdef(REPORT)) { /* report time */ - eputs("rtrace process ended\n"); + eputs("rtrace process closed\n"); report(0); } return(status); /* return status */ @@ -115,7 +115,7 @@ new_rtrace() /* restart rtrace calculation */ getradfile() /* run rad and get needed variables */ { - static short mvar[] = {OCTREE,-1}; + static short mvar[] = {OCTREE,EYESEP,-1}; static char tf1[] = TEMPLATE; char tf2[64]; char combuf[256]; @@ -124,7 +124,7 @@ getradfile() /* run rad and get needed variables */ register char *cp; /* check if rad file specified */ if (!vdef(RIF)) - return; + return(0); /* create rad command */ mktemp(tf1); sprintf(tf2, "%s.rif", tf1); @@ -147,17 +147,17 @@ getradfile() /* run rad and get needed variables */ 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"); - } +#ifdef DEBUG + wputs(combuf); wputs("\n"); +#endif + system(combuf); /* ignore exit code */ if (pippt == NULL) { loadvars(tf2); /* load variables */ unlink(tf2); } rtargc += wordfile(rtargv+rtargc, tf1); /* get rtrace options */ unlink(tf1); /* clean up */ + return(1); }