--- ray/src/rt/persist.c	2004/09/19 07:24:37	2.36
+++ ray/src/rt/persist.c	2010/12/15 17:24:29	2.42
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: persist.c,v 2.36 2004/09/19 07:24:37 greg Exp $";
+static const char	RCSid[] = "$Id: persist.c,v 2.42 2010/12/15 17:24:29 greg Exp $";
 #endif
 /*
  * Routines for persistent rtrace and rpict processes.
@@ -12,8 +12,13 @@ static const char	RCSid[] = "$Id: persist.c,v 2.36 200
 #include <string.h>
 #include <signal.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 
 #include "platform.h"
+#ifndef NON_POSIX /* XXX need abstraction for process management */
+ #include <sys/wait.h>
+#endif
+
 #include "rtprocess.h" /* getpid() */
 #include "standard.h"
 #include "random.h"
@@ -34,9 +39,9 @@ static char	*persistfname = NULL;	/* persist file name
 static int	persistfd = -1;		/* persist file descriptor */
 static char	inpname[TEMPLEN+1], outpname[TEMPLEN+1], errname[TEMPLEN+1];
 
-typedef void (sighandler_t)(int);
-static sighandler_t sig_io;
-static sighandler_t sig_alrm;
+typedef void (rsighandler_t)(int);
+static rsighandler_t sig_io;
+static rsighandler_t sig_alrm;
 
 
 extern void
@@ -117,14 +122,14 @@ static void sig_alrm(int i) { quit(0); }
 extern void
 pfhold(void)		/* holding pattern for idle rendering process */
 {
-	sighandler_t	*oldalrm;
+	rsighandler_t	*oldalrm;
 	char	buf[512];
 	register int	n;
 				/* close input and output descriptors */
-	close(fileno(stdin));
-	close(fileno(stdout));
+	close(0);
+	close(1);
 	if (errfile == NULL)
-		close(fileno(stderr));
+		close(2);
 				/* create named pipes for input and output */
 	if (mkfifo(mktemp(strcpy(inpname,TEMPLATE)), 0600) < 0)
 		goto createrr;
@@ -152,12 +157,6 @@ pfhold(void)		/* holding pattern for idle rendering pr
 	signal(SIGIO, SIG_DFL);
 	pflock(1);			/* grab persist file back */
 				/* someone wants us; reopen stdin and stdout */
-	/*
-	if (freopen(inpname, "r", stdin) == NULL)
-		goto openerr;
-	if (freopen(outpname, "w", stdout) == NULL)
-		goto openerr;
-	*/
 	close(0);
 	if (open(inpname, O_RDONLY) != 0)
 		error(INTERNAL, "unexpected stdin file number");
@@ -180,8 +179,6 @@ pfhold(void)		/* holding pattern for idle rendering pr
 	return;
 createrr:
 	error(SYSTEM, "cannot create named pipes in pfhold");
-openerr:
-	error(SYSTEM, "cannot open named pipes in pfhold");
 }