--- ray/src/hd/rhoptimize.c	2003/06/13 15:27:04	3.11
+++ ray/src/hd/rhoptimize.c	2003/07/27 22:12:02	3.15
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rhoptimize.c,v 3.11 2003/06/13 15:27:04 greg Exp $";
+static const char	RCSid[] = "$Id: rhoptimize.c,v 3.15 2003/07/27 22:12:02 schorsch Exp $";
 #endif
 /*
  * Optimize holodeck for quick access.
@@ -7,10 +7,12 @@ static const char	RCSid[] = "$Id: rhoptimize.c,v 3.11 
  *	11/4/98		Greg Ward Larson
  */
 
-#include "holo.h"
-
 #include <signal.h>
+#include <string.h>
 
+#include "rtprocess.h" /* getpid() */
+#include "holo.h"
+
 #ifndef BKBSIZE
 #define BKBSIZE		256		/* beam clump size (kilobytes) */
 #endif
@@ -19,7 +21,6 @@ char	*progname;
 char	tempfile[128];
 int	dupchecking = 0;
 
-extern char	*rindex();
 extern long	rhinitcopy();
 
 
@@ -37,7 +38,7 @@ char	*argv[];
 		dupchecking++;
 		argv++; argc--;
 	}
-	if (argc < 1 | argc > 2) {
+	if ((argc < 1) | (argc > 2)) {
 		fprintf(stderr, "Usage: %s [-u] input.hdk [output.hdk]\n",
 				progname);
 		exit(1);
@@ -52,7 +53,7 @@ char	*argv[];
 			error(SYSTEM, errmsg);
 		}
 		strcpy(tempfile, inpname);
-		if ((outname = rindex(tempfile, '/')) != NULL)
+		if ((outname = strrchr(tempfile, '/')) != NULL)
 			outname++;
 		else
 			outname = tempfile;
@@ -157,9 +158,9 @@ int	n;
 					rva[i].r[1][0]==rva[j].r[1][0] &&
 					rva[i].r[1][1]==rva[j].r[1][1] ) {
 				n--;		/* swap duplicate with end */
-				copystruct(&rtmp, rva+n);
-				copystruct(rva+n, rva+i);
-				copystruct(rva+i, &rtmp);
+				rtmp = *(rva+n);
+				*(rva+n) = *(rva+i);
+				*(rva+i) = rtmp;
 				i--;		/* recheck one we swapped */
 			}
 	return(n);
@@ -196,7 +197,7 @@ int	*bq, nb;
 		bp = hdgetbeam(hp, bq[i]);
 		DCHECK(bp==NULL, CONSISTENCY, "empty beam in xferclump");
 		n = dupchecking ? nuniq(hdbray(bp),bp->nrm) : bp->nrm;
-		bcopy((void *)hdbray(bp), (void *)hdnewrays(hout,bq[i],n),
+		memcpy((void *)hdnewrays(hout,bq[i],n),(void *)hdbray(bp), 
 				n*sizeof(RAYVAL));
 		hdfreebeam(hp, bq[i]);
 	}