--- ray/src/hd/rholo.c	2003/02/22 02:07:25	3.52
+++ ray/src/hd/rholo.c	2003/06/30 14:59:12	3.59
@@ -1,15 +1,17 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rholo.c,v 3.52 2003/02/22 02:07:25 greg Exp $";
+static const char	RCSid[] = "$Id: rholo.c,v 3.59 2003/06/30 14:59:12 schorsch Exp $";
 #endif
 /*
  * Radiance holodeck generation controller
  */
 
-#include "rholo.h"
-#include "random.h"
 #include <signal.h>
 #include <sys/stat.h>
+#include <string.h>
 
+#include "rholo.h"
+#include "random.h"
+
 #ifndef FRAGWARN
 #define FRAGWARN	20		/* fragmentation for warning (%) */
 #endif
@@ -45,7 +47,7 @@ time_t	starttime;		/* time we got started */
 time_t	endtime;		/* time we should end by */
 time_t	reporttime;		/* time for next report */
 
-long	maxdisk;		/* maximum file space (bytes) */
+off_t	maxdisk;		/* maximum file space (bytes) */
 
 int	rtargc = 1;		/* rtrace command */
 char	*rtargv[128] = {"rtrace", NULL};
@@ -152,6 +154,7 @@ userr:
 }
 
 
+void
 onsig(signo)				/* fatal signal */
 int  signo;
 {
@@ -214,7 +217,7 @@ initrholo()			/* get our holodeck running */
 		init_global();
 						/* record disk space limit */
 	if (!vdef(DISKSPACE))
-		maxdisk = (1L<<(sizeof(long)*8-2)) - 1024;
+		maxdisk = ((off_t)1<<(sizeof(off_t)*8-2)) - 1024;
 	else
 		maxdisk = 1024.*1024.*vflt(DISKSPACE);
 						/* set up memory cache */
@@ -287,7 +290,7 @@ rholo()				/* holodeck main loop */
 	static long	nextfragwarn = 100*(1L<<20);
 	static int	idle = 0;
 	PACKET	*pl = NULL, *plend;
-	long	fsiz;
+	off_t	fsiz;
 	int	pksiz;
 	register PACKET	*p;
 	time_t	t;
@@ -412,7 +415,7 @@ creatholo(gp)			/* create a holodeck output file */
 HDGRID	*gp;
 {
 	extern char	VersionID[];
-	int4	lastloc, nextloc;
+	int32	lastloc, nextloc;
 	int	n;
 	int	fd;
 	FILE	*fp;
@@ -430,7 +433,7 @@ HDGRID	*gp;
 	putw(HOLOMAGIC, fp);		/* put magic number */
 	fd = dup(fileno(fp));
 	fclose(fp);			/* flush and close stdio stream */
-	lastloc = lseek(fd, (off_t)0L, 2);
+	lastloc = lseek(fd, (off_t)0, 2);
 	for (n = vdef(SECTION); n--; gp++) {	/* initialize each section */
 		nextloc = 0L;
 		write(fd, (char *)&nextloc, sizeof(nextloc));
@@ -475,11 +478,10 @@ char	*s;
 
 loadholo()			/* start loading a holodeck from fname */
 {
-	extern long	ftell();
 	FILE	*fp;
 	int	fd;
 	int	n;
-	int4	nextloc;
+	int32	nextloc;
 	
 	if (ncprocs > 0 & force >= 0)
 		fp = fopen(hdkfile, "r+");
@@ -531,8 +533,8 @@ PACKET	*pl;
 	while (pl != NULL) {
 		p = pl; pl = p->next; p->next = NULL;
 		if (p->nr > 0) {		/* add to holodeck */
-			bcopy((char *)p->ra,
-				(char *)hdnewrays(hdlist[p->hd],p->bi,p->nr),
+			memcpy( (void *)hdnewrays(hdlist[p->hd],p->bi,p->nr),
+				(void *)p->ra,
 				p->nr*sizeof(RAYVAL));
 			if (outdev != NULL)	/* display it */
 				disp_packet((PACKHEAD *)p);
@@ -608,7 +610,7 @@ int	ec;
 		if (nprocs > 0)
 			status = done_rtrace();		/* calls hdsync() */
 		if (ncprocs > 0 & force >= 0 && vdef(REPORT)) {
-			long	fsiz, fuse;
+			off_t	fsiz, fuse;
 			fsiz = hdfilen(hdlist[0]->fd);
 			fuse = hdfiluse(hdlist[0]->fd, 1);
 			fprintf(stderr,