--- ray/src/rt/rtmain.c	2004/03/30 16:13:01	2.9
+++ ray/src/rt/rtmain.c	2006/04/05 06:22:57	2.14
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rtmain.c,v 2.9 2004/03/30 16:13:01 schorsch Exp $";
+static const char	RCSid[] = "$Id: rtmain.c,v 2.14 2006/04/05 06:22:57 greg Exp $";
 #endif
 /*
  *  rtmain.c - main for rtrace per-ray calculation program
@@ -7,7 +7,6 @@ static const char	RCSid[] = "$Id: rtmain.c,v 2.9 2004/
 
 #include "copyright.h"
 
-#include  <sys/types.h>
 #include  <signal.h>
 
 #include  "platform.h"
@@ -46,6 +45,8 @@ extern int  lim_dist;			/* limit distance? */
 extern char  *tralist[];		/* list of modifers to trace (or no) */
 extern int  traincl;			/* include == 1, exclude == 0 */
 
+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);
@@ -64,7 +65,6 @@ main(int  argc, 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;
@@ -227,7 +227,13 @@ main(int  argc, char  *argv[])
 					/* initialize object types */
 	initotypes();
 					/* initialize urand */
-	initurand(2048);
+	if (rand_samp) {
+		srandom((long)time(0));
+		initurand(0);
+	} else {
+		srandom(0L);
+		initurand(2048);
+	}
 					/* set up signal handling */
 	sigdie(SIGINT, "Interrupt");
 #ifdef SIGHUP
@@ -273,12 +279,8 @@ main(int  argc, 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;
 
@@ -423,19 +425,22 @@ printdefaults(void)			/* print default values to stdou
 
 	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 +448,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 ?