--- ray/src/hd/rholo4.c	1999/02/12 11:32:22	3.26
+++ ray/src/hd/rholo4.c	2003/07/27 22:12:02	3.35
@@ -1,16 +1,15 @@
-/* Copyright (c) 1999 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: rholo4.c,v 3.35 2003/07/27 22:12:02 schorsch Exp $";
 #endif
-
 /*
  * Holodeck display process communication
  */
 
 #include "rholo.h"
 #include "rhdisp.h"
+#include "rtprocess.h"
 #include <sys/uio.h>
+#include <string.h>
 
 #ifndef HDSUF
 #define HDSUF		".hdi"
@@ -24,7 +23,7 @@ static char SCCSid[] = "$SunId$ SGI";
 #endif
 
 static int	inp_flags;
-static int	dpd[3];
+static SUBPROC	dpd;
 static FILE	*dpout;
 
 
@@ -35,9 +34,9 @@ char	*dname;
 	int	i, n, len;
 
 	if (!strcmp(dname, SLAVENAME)) {
-		dpd[0] = 0;		/* read from stdin */
+		dpd.r = 0;		/* read from stdin */
 		dpout = stdout;		/* write to stdout */
-		dpd[2] = -1;		/* we're the slave process */
+		dpd.running = 0; /* we're the slave procees */
 	} else {
 					/* get full display program name */
 #ifdef DEVPATH
@@ -55,17 +54,17 @@ char	*dname;
 		cmd[0] = buf;
 		cmd[1] = froot; cmd[2] = fd1; cmd[3] = fd0;
 		cmd[4] = NULL;
-		i = open_process(dpd, cmd);
+		i = open_process(&dpd, cmd);
 		if (i <= 0)
 			error(USER, "cannot start display process");
-		if ((dpout = fdopen(dpd[1], "w")) == NULL)
+		if ((dpout = fdopen(dpd.w, "w")) == NULL)
 			error(SYSTEM, "problem opening display pipe");
 					/* close dup'ed stdin and stdout */
 		if (readinp)
 			close(atoi(fd0));
 		close(atoi(fd1));
 	}
-	dpd[1] = -1;		/* causes ignored error in close_process() */
+	dpd.w = -1;		/* causes ignored error in close_process() */
 	inp_flags = 0;
 				/* check if outside */
 	if (vdef(OBSTRUCTIONS) && vbool(OBSTRUCTIONS))
@@ -77,7 +76,7 @@ char	*dname;
 	}
 				/* write out hologram grids & octrees */
 	for (i = 0; hdlist[i] != NULL; i++) {
-		bcopy((char *)hdlist[i], buf, sizeof(HDGRID));
+		memcpy(buf, (void *)hdlist[i], sizeof(HDGRID));
 		len = sizeof(HDGRID);
 		n = vdef(GEOMETRY);
 		sfn = i<n ? nvalue(GEOMETRY,i) :
@@ -115,17 +114,17 @@ int	block;
 					/* check read blocking */
 	if (block != (inp_flags == 0)) {
 		inp_flags = block ? 0 : FNONBLK;
-		if (fcntl(dpd[0], F_SETFL, inp_flags) < 0)
+		if (fcntl(dpd.r, F_SETFL, inp_flags) < 0)
 			goto fcntlerr;
 	}
 					/* read message header */
-	n = read(dpd[0], (char *)&msg, sizeof(MSGHEAD));
+	n = read(dpd.r, (char *)&msg, sizeof(MSGHEAD));
 	if (n != sizeof(MSGHEAD)) {
 		if (n >= 0) {
 			dpout = NULL;
 			error(USER, "display process died");
 		}
-		if (errno != EAGAIN & errno != EINTR)
+		if ((errno != EAGAIN) & (errno != EINTR))
 			goto readerr;
 		return(2);		/* acceptable failure */
 	}
@@ -135,9 +134,9 @@ int	block;
 		buf = (char *)malloc(msg.nbytes);
 		if (buf == NULL)
 			error(SYSTEM, "out of memory in disp_check");
-		if (inp_flags != 0 && fcntl(dpd[0], F_SETFL, inp_flags=0) < 0)
+		if (inp_flags != 0 && fcntl(dpd.r, F_SETFL, inp_flags=0) < 0)
 			goto fcntlerr;
-		if (readbuf(dpd[0], buf, msg.nbytes) != msg.nbytes)
+		if (readbuf(dpd.r, buf, msg.nbytes) != msg.nbytes)
 			goto readerr;
 	}
 	switch (msg.type) {		/* take appropriate action */
@@ -187,7 +186,7 @@ int	block;
 	case DR_VIEWPOINT:	/* set target eye position */
 		if (msg.nbytes != sizeof(VIEWPOINT))
 			error(INTERNAL, "bad DR_VIEWPOINT from display process");
-		copystruct(&myeye, (VIEWPOINT *)buf);
+		myeye = *((VIEWPOINT *)buf);
 		break;
 	case DR_ATTEN:		/* block for priority request */
 		if (msg.nbytes)
@@ -216,7 +215,7 @@ int	block;
 	case DR_CLOBBER:	/* clobber holodeck */
 		if (msg.nbytes)
 			error(INTERNAL, "bad DR_CLOBBER from display process");
-		if (!force || !ncprocs)
+		if ((force <= 0) | (ncprocs <= 0))
 			error(WARNING, "request to clobber holodeck denied");
 		else {
 			error(WARNING, "clobbering holodeck contents");
@@ -253,7 +252,8 @@ disp_close()			/* close our display process */
 	disp_result(DS_SHUTDOWN, 0, NULL);
 	fclose(dpout);
 	dpout = NULL;
-	return(dpd[2]<0 ? 0 : close_process(dpd));
+	return(dpd.running ? close_process(&dpd) : 0);
+
 }