--- ray/src/rt/rtmain.c	2005/05/25 04:44:26	2.10
+++ ray/src/rt/rtmain.c	2009/06/22 20:52:56	2.17
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rtmain.c,v 2.10 2005/05/25 04:44:26 greg Exp $";
+static const char	RCSid[] = "$Id: rtmain.c,v 2.17 2009/06/22 20:52:56 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.10 2005
 
 #include "copyright.h"
 
-#include  <sys/types.h>
 #include  <signal.h>
 
 #include  "platform.h"
@@ -228,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
@@ -274,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;
 
@@ -308,10 +309,11 @@ main(int  argc, char  *argv[])
 			while ((rval=fork()) == 0) {	/* keep on forkin' */
 				pflock(1);
 				pfhold();
+				ambsync();		/* load new values */
 			}
 			if (rval < 0)
 				error(SYSTEM, "cannot fork child for persist function");
-			pfdetach();		/* parent exits */
+			pfdetach();		/* parent will run then exit */
 		}
 	}
 runagain:
@@ -334,7 +336,6 @@ runagain:
 		}
 	}
 	if (persist == PCHILD) {	/* wait for a signal then go again */
-		close(duped1);			/* release output handle */
 		pfhold();
 		raynum = nrays = 0;		/* reinitialize */
 		goto runagain;
@@ -424,8 +425,8 @@ 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 (flush interval)\n", hresolu);
-	printf("-y  %-9d\t\t\t# y resolution\n", vresolu);
+	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 ? '+' : '-',
@@ -439,6 +440,7 @@ printdefaults(void)			/* print default values to stdou
 		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;
@@ -446,9 +448,9 @@ 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 'W': printf(" contribution"); break;
 		case '-': printf(" stroke"); break;
 		}
 	putchar('\n');