--- ray/src/rt/rtmain.c	2003/05/13 17:58:33	2.3
+++ ray/src/rt/rtmain.c	2004/03/30 16:13:01	2.9
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rtmain.c,v 2.3 2003/05/13 17:58:33 greg Exp $";
+static const char	RCSid[] = "$Id: rtmain.c,v 2.9 2004/03/30 16:13:01 schorsch Exp $";
 #endif
 /*
  *  rtmain.c - main for rtrace per-ray calculation program
@@ -7,19 +7,18 @@ static const char	RCSid[] = "$Id: rtmain.c,v 2.3 2003/
 
 #include "copyright.h"
 
-#include  "ray.h"
+#include  <sys/types.h>
+#include  <signal.h>
 
+#include  "platform.h"
+#include  "rtprocess.h" /* getpid() */
+#include  "resolu.h"
+#include  "ray.h"
 #include  "source.h"
-
 #include  "ambient.h"
-
 #include  "random.h"
-
 #include  "paths.h"
 
-#include  <sys/types.h>
-
-#include  <signal.h>
 					/* persistent processes define */
 #ifdef  F_SETLKW
 #define  PERSIST	1		/* normal persist */
@@ -28,13 +27,9 @@ static const char	RCSid[] = "$Id: rtmain.c,v 2.3 2003/
 #endif
 
 char  *progname;			/* argv[0] */
-
 char  *octname;				/* octree name */
-
 char  *sigerr[NSIG];			/* signal error messages */
-
 char  *shm_boundary = NULL;		/* boundary of shared memory */
-
 char  *errfile = NULL;			/* error output file */
 
 extern char  *formstr();		/* string from format */
@@ -51,15 +46,13 @@ extern int  lim_dist;			/* limit distance? */
 extern char  *tralist[];		/* list of modifers to trace (or no) */
 extern int  traincl;			/* include == 1, exclude == 0 */
 
-void	onsig();
-void	sigdie();
-void	printdefaults();
+static void onsig(int  signo);
+static void sigdie(int  signo, char  *msg);
+static void printdefaults(void);
 
 
 int
-main(argc, argv)
-int  argc;
-char  *argv[];
+main(int  argc, char  *argv[])
 {
 #define	 check(ol,al)		if (argv[i][ol] || \
 				badarg(argc-i-1,argv+i+1,al)) \
@@ -237,10 +230,16 @@ char  *argv[];
 	initurand(2048);
 					/* set up signal handling */
 	sigdie(SIGINT, "Interrupt");
+#ifdef SIGHUP
 	sigdie(SIGHUP, "Hangup");
+#endif
 	sigdie(SIGTERM, "Terminate");
+#ifdef SIGPIPE
 	sigdie(SIGPIPE, "Broken pipe");
+#endif
+#ifdef SIGALRM
 	sigdie(SIGALRM, "Alarm clock");
+#endif
 #ifdef	SIGXCPU
 	sigdie(SIGXCPU, "CPU limit exceeded");
 	sigdie(SIGXFSZ, "File size exceeded");
@@ -274,11 +273,11 @@ char  *argv[];
 		openheader();
 	}
 #endif
-#ifdef	MSDOS
+#ifdef	_WIN32
 	if (outform != 'a')
-		setmode(fileno(stdout), O_BINARY);
+		SET_FILE_BINARY(stdout);
 	if (octname == NULL)
-		setmode(fileno(stdin), O_BINARY);
+		SET_FILE_BINARY(stdin);
 #endif
 	readoct(octname, loadflags, &thescene, NULL);
 	nsceneobjs = nobjects;
@@ -345,6 +344,7 @@ runagain:
 badopt:
 	sprintf(errmsg, "command line error at '%s'", argv[i]);
 	error(USER, errmsg);
+	return 1; /* pro forma return */
 
 #undef	check
 #undef	bool
@@ -352,8 +352,9 @@ badopt:
 
 
 void
-wputs(s)				/* warning output function */
-char	*s;
+wputs(				/* warning output function */
+	char	*s
+)
 {
 	int  lasterrno = errno;
 	eputs(s);
@@ -362,8 +363,9 @@ char	*s;
 
 
 void
-eputs(s)				/* put string to stderr */
-register char  *s;
+eputs(				/* put string to stderr */
+	register char  *s
+)
 {
 	static int  midline = 0;
 
@@ -381,17 +383,20 @@ register char  *s;
 }
 
 
-void
-onsig(signo)				/* fatal signal */
-int  signo;
+static void
+onsig(				/* fatal signal */
+	int  signo
+)
 {
 	static int  gotsig = 0;
 
 	if (gotsig++)			/* two signals and we're gone! */
 		_exit(signo);
 
+#ifdef SIGALRM
 	alarm(15);			/* allow 15 seconds to clean up */
 	signal(SIGALRM, SIG_DFL);	/* make certain we do die */
+#endif
 	eputs("signal - ");
 	eputs(sigerr[signo]);
 	eputs("\n");
@@ -399,10 +404,11 @@ int  signo;
 }
 
 
-void
-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);
@@ -410,8 +416,8 @@ char  *msg;
 }
 
 
-void
-printdefaults()			/* print default values to stdout */
+static void
+printdefaults(void)			/* print default values to stdout */
 {
 	register char  *cp;