--- ray/src/hd/rholo.c	2003/02/22 02:07:25	3.52
+++ ray/src/hd/rholo.c	2004/09/09 00:25:59	3.66
@@ -1,15 +1,22 @@
 #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.66 2004/09/09 00:25:59 greg Exp $";
 #endif
 /*
  * Radiance holodeck generation controller
  */
 
-#include "rholo.h"
-#include "random.h"
+#include <stdio.h>
+#include <time.h>
 #include <signal.h>
 #include <sys/stat.h>
+#include <string.h>
 
+#include "platform.h"
+#include "rterror.h"
+#include "resolu.h"
+#include "rholo.h"
+#include "random.h"
+
 #ifndef FRAGWARN
 #define FRAGWARN	20		/* fragmentation for warning (%) */
 #endif
@@ -45,7 +52,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};
@@ -62,12 +69,24 @@ char  *sigerr[NSIG];		/* signal error messages */
 
 extern int	nowarn;		/* turn warnings off? */
 
-extern time_t	time();
+static void onsig(int  signo);
+static void sigdie(int  signo, char  *msg);
+static int resfmode(int	fd, int	mod);
+static void initrholo(void);
+static int rholo(void);
+static void setdefaults(HDGRID	*gp);
+static void creatholo(HDGRID	*gp);
+static gethfunc headline;
+static void loadholo(void);
+static void rootname(char	*rn, char	*fn);
+static void badvalue(int	vc);
 
 
-main(argc, argv)
-int	argc;
-char	*argv[];
+int
+main(
+	int	argc,
+	char	*argv[]
+)
 {
 	int	i;
 
@@ -149,11 +168,14 @@ userr:
 "Usage: %s [-n nprocs][-o disp][-w][-r|-f] output.hdk [control.hif|+|- [VAR=val ..]]\n",
 			progname);
 	quit(1);
+	return 1; /* pro forma return */
 }
 
 
-onsig(signo)				/* fatal signal */
-int  signo;
+static void
+onsig(				/* fatal signal */
+	int  signo
+)
 {
 	static int  gotsig = 0;
 
@@ -171,9 +193,11 @@ int  signo;
 }
 
 
-sigdie(signo, msg)			/* set fatal signal */
-int  signo;
-char  *msg;
+static void
+sigdie(			/* set fatal signal */
+	int  signo,
+	char  *msg
+)
 {
 	if (signal(signo, onsig) == SIG_IGN)
 		signal(signo, SIG_IGN);
@@ -181,9 +205,11 @@ char  *msg;
 }
 
 
-int
-resfmode(fd, mod)		/* restrict open file access mode */
-int	fd, mod;
+static int
+resfmode(		/* restrict open file access mode */
+	int	fd,
+	int	mod
+)
 {
 	struct stat	stbuf;
 					/* get original mode */
@@ -201,7 +227,8 @@ int	fd, mod;
 }
 
 
-initrholo()			/* get our holodeck running */
+static void
+initrholo(void)			/* get our holodeck running */
 {
 	extern int	global_packet();
 	register int	i;
@@ -214,7 +241,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 */
@@ -266,28 +293,37 @@ initrholo()			/* get our holodeck running */
 	}
 					/* set up signal handling */
 	sigdie(SIGINT, "Interrupt");
-	sigdie(SIGHUP, "Hangup");
 	sigdie(SIGTERM, "Terminate");
+#ifdef SIGHUP
+	sigdie(SIGHUP, "Hangup");
+#endif
+#ifdef SIGPIPE
 	sigdie(SIGPIPE, "Broken pipe");
+#endif
+#ifdef SIGALRM
 	sigdie(SIGALRM, "Alarm clock");
+#endif
 #ifdef	SIGXCPU
 	sigdie(SIGXCPU, "CPU limit exceeded");
+#endif
+#ifdef	SIGXFSZ
 	sigdie(SIGXFSZ, "File size exceeded");
 #endif
 					/* protect holodeck file */
-	orig_mode = resfmode(hdlist[0]->fd, ncprocs>0&force>=0 ? 0 : 0444);
+	orig_mode = resfmode(hdlist[0]->fd, (ncprocs>0) & (force>=0) ? 0 : 0444);
 	return;
 memerr:
 	error(SYSTEM, "out of memory in initrholo");
 }
 
 
-rholo()				/* holodeck main loop */
+static int
+rholo(void)				/* 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;
@@ -309,11 +345,14 @@ rholo()				/* holodeck main loop */
 	}
 #if FRAGWARN
 	if (fsiz >= nextfragwarn &&
-		(fsiz-hdfiluse(hdlist[0]->fd,0))/(fsiz/100) > FRAGWARN) {
-		sprintf(errmsg, "holodeck file fragmentation is %.0f%%",
-				100.*(fsiz-hdfiluse(hdlist[0]->fd,1))/fsiz);
-		error(WARNING, errmsg);
-		nextfragwarn = fsiz + (fsiz>>2);	/* decent interval */
+		    (fsiz-hdfiluse(hdlist[0]->fd,0))/(fsiz/100) > FRAGWARN) {
+		double	pctfrag = 100.*(fsiz-hdfiluse(hdlist[0]->fd,1))/fsiz;
+		if (pctfrag >= (double)FRAGWARN) {
+			sprintf(errmsg, "holodeck file fragmentation is %.0f%%",
+					pctfrag);
+			error(WARNING, errmsg);
+			nextfragwarn = fsiz + (fsiz>>2);
+		}
 	}
 #endif
 	t = time(NULL);			/* check time */
@@ -351,14 +390,15 @@ rholo()				/* holodeck main loop */
 }
 
 
-setdefaults(gp)			/* set default values */
-register HDGRID	*gp;
+static void
+setdefaults(			/* set default values */
+	register HDGRID	*gp
+)
 {
 	extern char	*atos();
 	register int	i;
 	int	n;
 	double	len[3], d;
-	char	buf[64];
 
 	if (!vdef(SECTION)) {
 		sprintf(errmsg, "%s must be defined", vnam(SECTION));
@@ -408,11 +448,13 @@ register HDGRID	*gp;
 }
 
 
-creatholo(gp)			/* create a holodeck output file */
-HDGRID	*gp;
+static void
+creatholo(			/* create a holodeck output file */
+	HDGRID	*gp
+)
 {
 	extern char	VersionID[];
-	int4	lastloc, nextloc;
+	int32	lastloc, nextloc;
 	int	n;
 	int	fd;
 	FILE	*fp;
@@ -430,7 +472,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, SEEK_END);
 	for (n = vdef(SECTION); n--; gp++) {	/* initialize each section */
 		nextloc = 0L;
 		write(fd, (char *)&nextloc, sizeof(nextloc));
@@ -438,18 +480,20 @@ HDGRID	*gp;
 		if (!n)
 			break;
 		nextloc = hdfilen(fd);		/* write section pointer */
-		if (lseek(fd, (off_t)lastloc, 0) < 0)
+		if (lseek(fd, (off_t)lastloc, SEEK_SET) < 0)
 			error(SYSTEM,
 				"cannot seek on holodeck file in creatholo");
 		write(fd, (char *)&nextloc, sizeof(nextloc));
-		lseek(fd, (off_t)(lastloc=nextloc), 0);
+		lseek(fd, (off_t)(lastloc=nextloc), SEEK_SET);
 	}
 }
 
 
-int
-headline(s)			/* process information header line */
-char	*s;
+static int
+headline(			/* process information header line */
+	char	*s,
+	void	*p
+)
 {
 	extern char	FMTSTR[];
 	register char	*cp;
@@ -473,15 +517,15 @@ char	*s;
 }
 
 
-loadholo()			/* start loading a holodeck from fname */
+static void
+loadholo(void)			/* start loading a holodeck from fname */
 {
-	extern long	ftell();
 	FILE	*fp;
 	int	fd;
 	int	n;
-	int4	nextloc;
+	int32	nextloc;
 	
-	if (ncprocs > 0 & force >= 0)
+	if ((ncprocs > 0) & (force >= 0))
 		fp = fopen(hdkfile, "r+");
 	else
 		fp = NULL;
@@ -510,7 +554,7 @@ loadholo()			/* start loading a holodeck from fname */
 	fd = dup(fileno(fp));
 	fclose(fp);				/* done with stdio */
 	for (n = 0; nextloc > 0L; n++) {	/* initialize each section */
-		lseek(fd, (off_t)nextloc, 0);
+		lseek(fd, (off_t)nextloc, SEEK_SET);
 		read(fd, (char *)&nextloc, sizeof(nextloc));
 		hdinit(fd, NULL);
 	}
@@ -522,8 +566,10 @@ loadholo()			/* start loading a holodeck from fname */
 }
 
 
-done_packets(pl)		/* handle finished packets */
-PACKET	*pl;
+extern void
+done_packets(		/* handle finished packets */
+	PACKET	*pl
+)
 {
 	static int	n2flush = 0;
 	register PACKET	*p;
@@ -531,8 +577,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);
@@ -555,23 +601,29 @@ PACKET	*pl;
 }
 
 
-rootname(rn, fn)		/* remove tail from end of fn */
-register char	*rn, *fn;
+static void
+rootname(		/* remove tail from end of fn */
+	register char	*rn,
+	register char	*fn
+)
 {
 	char	*tp, *dp;
 
-	for (tp = NULL, dp = rn; *rn = *fn++; rn++)
+	for (tp = NULL, dp = rn; (*rn = *fn++); rn++) {
 		if (*rn == '/')
 			dp = rn;
 		else if (*rn == '.')
 			tp = rn;
+	}
 	if (tp != NULL && tp > dp)
 		*tp = '\0';
 }
 
 
-badvalue(vc)			/* report bad variable value and exit */
-int	vc;
+static void
+badvalue(			/* report bad variable value and exit */
+	int	vc
+)
 {
 	sprintf(errmsg, "bad value for variable '%s'", vnam(vc));
 	error(USER, errmsg);
@@ -607,8 +659,8 @@ int	ec;
 	if (hdlist[0] != NULL) {	/* close holodeck */
 		if (nprocs > 0)
 			status = done_rtrace();		/* calls hdsync() */
-		if (ncprocs > 0 & force >= 0 && vdef(REPORT)) {
-			long	fsiz, fuse;
+		if ((ncprocs > 0) & (force >= 0) && vdef(REPORT)) {
+			off_t	fsiz, fuse;
 			fsiz = hdfilen(hdlist[0]->fd);
 			fuse = hdfiluse(hdlist[0]->fd, 1);
 			fprintf(stderr,