--- ray/src/rt/rvmain.c	2003/02/25 02:47:23	2.2
+++ ray/src/rt/rvmain.c	2005/06/15 15:36:52	2.5
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rvmain.c,v 2.2 2003/02/25 02:47:23 greg Exp $";
+static const char	RCSid[] = "$Id: rvmain.c,v 2.5 2005/06/15 15:36:52 greg Exp $";
 #endif
 /*
  *  rvmain.c - main for rview interactive viewer
@@ -7,18 +7,16 @@ static const char	RCSid[] = "$Id: rvmain.c,v 2.2 2003/
 
 #include "copyright.h"
 
-#include  "ray.h"
+#include  <signal.h>
+#include  <time.h>
 
+#include  "platform.h"
+#include  "ray.h"
 #include  "source.h"
-
 #include  "ambient.h"
-
+#include  "rpaint.h"
 #include  "random.h"
-
 #include  "paths.h"
-
-#include  <signal.h>
-
 #include  "view.h"
 
 char  *progname;			/* argv[0] */
@@ -45,15 +43,13 @@ extern int  vresolu;			/* vertical resolution */
 extern int  psample;			/* pixel sample size */
 extern double  maxdiff;			/* max. sample difference */
 
-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)) \
@@ -174,6 +170,7 @@ char  *argv[];
 	initotypes();
 					/* initialize urand */
 	initurand(2048);
+	srandom(rand_samp ? (long)time(0) : 0L);
 					/* set up signal handling */
 	sigdie(SIGINT, "Interrupt");
 	sigdie(SIGHUP, "Hangup");
@@ -207,9 +204,7 @@ char  *argv[];
 	if (octname == NULL)
 		error(USER, "missing octree argument");
 					/* set up output */
-#ifdef	MSDOS
-	setmode(fileno(stdout), O_BINARY);
-#endif
+	SET_FILE_BINARY(stdout);
 	readoct(octname, ~(IO_FILES|IO_INFO), &thescene, NULL);
 	nsceneobjs = nobjects;
 
@@ -226,6 +221,7 @@ char  *argv[];
 badopt:
 	sprintf(errmsg, "command line error at '%s'", argv[i]);
 	error(USER, errmsg);
+	return 1; /* pro forma return */
 
 #undef	check
 #undef	bool
@@ -233,8 +229,9 @@ badopt:
 
 
 void
-wputs(s)				/* warning output function */
-char	*s;
+wputs(				/* warning output function */
+	char	*s
+)
 {
 	int  lasterrno = errno;
 	eputs(s);
@@ -243,8 +240,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;
 
@@ -262,9 +260,10 @@ register char  *s;
 }
 
 
-void
-onsig(signo)				/* fatal signal */
-int  signo;
+static void
+onsig(				/* fatal signal */
+	int  signo
+)
 {
 	static int  gotsig = 0;
 
@@ -280,10 +279,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);
@@ -291,11 +291,9 @@ char  *msg;
 }
 
 
-void
-printdefaults()			/* print default values to stdout */
+static void
+printdefaults(void)			/* print default values to stdout */
 {
-	register char  *cp;
-
 	printf(greyscale ? "-b+\t\t\t\t# greyscale on\n" :
 			"-b-\t\t\t\t# greyscale off\n");
 	printf("-vt%c\t\t\t\t# view type %s\n", ourview.type,