--- ray/src/rt/rtmain.c	2003/10/21 19:19:28	2.8
+++ ray/src/rt/rtmain.c	2006/02/05 22:22:20	2.13
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rtmain.c,v 2.8 2003/10/21 19:19:28 schorsch Exp $";
+static const char	RCSid[] = "$Id: rtmain.c,v 2.13 2006/02/05 22:22:20 greg Exp $";
 #endif
 /*
  *  rtmain.c - main for rtrace per-ray calculation program
@@ -7,11 +7,11 @@ static const char	RCSid[] = "$Id: rtmain.c,v 2.8 2003/
 
 #include "copyright.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"
@@ -26,13 +26,9 @@ static const char	RCSid[] = "$Id: rtmain.c,v 2.8 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 */
@@ -49,15 +45,15 @@ 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(int);
-void	sigdie(int, char*);
-void	printdefaults(void);
+static int  loadflags = ~IO_FILES;	/* what to load from octree */
 
+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)) \
@@ -69,7 +65,6 @@ char  *argv[];
 				case 'n': case 'N': case 'f': case 'F': \
 				case '-': case '0': var = 0; break; \
 				default: goto badopt; }
-	int  loadflags = ~IO_FILES;
 	int  persist = 0;
 	char  **tralp;
 	int  duped1;
@@ -233,6 +228,7 @@ char  *argv[];
 	initotypes();
 					/* initialize urand */
 	initurand(2048);
+	srandom(rand_samp ? (long)time(0) : 0L);
 					/* set up signal handling */
 	sigdie(SIGINT, "Interrupt");
 #ifdef SIGHUP
@@ -278,12 +274,8 @@ char  *argv[];
 		openheader();
 	}
 #endif
-#ifdef	_WIN32
 	if (outform != 'a')
 		SET_FILE_BINARY(stdout);
-	if (octname == NULL)
-		SET_FILE_BINARY(stdin);
-#endif
 	readoct(octname, loadflags, &thescene, NULL);
 	nsceneobjs = nobjects;
 
@@ -349,6 +341,7 @@ runagain:
 badopt:
 	sprintf(errmsg, "command line error at '%s'", argv[i]);
 	error(USER, errmsg);
+	return 1; /* pro forma return */
 
 #undef	check
 #undef	bool
@@ -356,8 +349,9 @@ badopt:
 
 
 void
-wputs(s)				/* warning output function */
-char	*s;
+wputs(				/* warning output function */
+	char	*s
+)
 {
 	int  lasterrno = errno;
 	eputs(s);
@@ -366,8 +360,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;
 
@@ -385,9 +380,10 @@ register char  *s;
 }
 
 
-void
-onsig(signo)				/* fatal signal */
-int  signo;
+static void
+onsig(				/* fatal signal */
+	int  signo
+)
 {
 	static int  gotsig = 0;
 
@@ -405,10 +401,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);
@@ -416,26 +413,29 @@ char  *msg;
 }
 
 
-void
+static void
 printdefaults(void)			/* print default values to stdout */
 {
 	register char  *cp;
 
 	if (imm_irrad)
 		printf("-I+\t\t\t\t# immediate irradiance on\n");
-	printf("-x  %-9d\t\t\t# x resolution\n", hresolu);
+	printf("-x  %-9d\t\t\t# x resolution (flush interval)\n", hresolu);
 	printf("-y  %-9d\t\t\t# y resolution\n", vresolu);
 	printf(lim_dist ? "-ld+\t\t\t\t# limit distance on\n" :
 			"-ld-\t\t\t\t# limit distance off\n");
+	printf("-h%c\t\t\t\t# %s header\n", loadflags & IO_INFO ? '+' : '-',
+			loadflags & IO_INFO ? "output" : "no");
 	printf("-f%c%c\t\t\t\t# format input/output = %s/%s\n",
 			inform, outform, formstr(inform), formstr(outform));
-	printf("-o%s\t\t\t\t# output", outvals);
+	printf("-o%-9s\t\t\t# output", outvals);
 	for (cp = outvals; *cp; cp++)
 		switch (*cp) {
-		case 't': printf(" trace"); break;
+		case 't': case 'T': printf(" trace"); break;
 		case 'o': printf(" origin"); break;
 		case 'd': printf(" direction"); break;
 		case 'v': printf(" value"); break;
+		case 'V': printf(" contribution"); break;
 		case 'l': printf(" length"); break;
 		case 'L': printf(" first_length"); break;
 		case 'p': printf(" point"); break;
@@ -443,7 +443,10 @@ printdefaults(void)			/* print default values to stdou
 		case 'N': printf(" unperturbed_normal"); break;
 		case 's': printf(" surface"); break;
 		case 'w': printf(" weight"); break;
+		case 'W': printf(" coefficient"); break;
 		case 'm': printf(" modifier"); break;
+		case 'M': printf(" material"); break;
+		case '-': printf(" stroke"); break;
 		}
 	putchar('\n');
 	printf(erract[WARNING].pf != NULL ?