--- ray/src/rt/rcmain.c	2015/02/24 19:39:27	2.14
+++ ray/src/rt/rcmain.c	2022/03/30 16:00:56	2.21
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rcmain.c,v 2.14 2015/02/24 19:39:27 greg Exp $";
+static const char	RCSid[] = "$Id: rcmain.c,v 2.21 2022/03/30 16:00:56 greg Exp $";
 #endif
 /*
  *  rcmain.c - main for rtcontrib ray contribution tracer
@@ -43,12 +43,15 @@ int	using_stdout = 0;		/* are we using stdout? */
 int	imm_irrad = 0;			/* compute immediate irradiance? */
 int	lim_dist = 0;			/* limit distance? */
 
-const char	*modname[MAXMODLIST];	/* ordered modifier name list */
-int		nmods = 0;		/* number of modifiers */
+int	report_intvl = 0;		/* reporting interval (seconds) */
 
+char	**modname = NULL;		/* ordered modifier name list */
+int	nmods = 0;			/* number of modifiers */
+int	modasiz = 0;			/* allocated modifier array size */
+
 void	(*addobjnotify[8])() = {ambnotify, NULL};
 
-char	RCCONTEXT[] = "RC";		/* our special evaluation context */
+char	RCCONTEXT[] = "RC.";		/* our special evaluation context */
 
 
 static void
@@ -163,7 +166,7 @@ main(int argc, char *argv[])
 #define	 check(ol,al)		if (argv[i][ol] || \
 				badarg(argc-i-1,argv+i+1,al)) \
 				goto badopt
-#define	 bool(olen,var)		switch (argv[i][olen]) { \
+#define	 check_bool(olen,var)		switch (argv[i][olen]) { \
 				case '\0': var = !var; break; \
 				case 'y': case 'Y': case 't': case 'T': \
 				case '+': case '1': var = 1; break; \
@@ -180,9 +183,12 @@ main(int argc, char *argv[])
 	progname = argv[0] = fixargv0(argv[0]);
 	gargv = argv;
 	gargc = argc;
+#if defined(_WIN32) || defined(_WIN64)
+	_setmaxstdio(2048);		/* increase file limit to maximum */
+#endif
 					/* initialize calcomp routines early */
 	initfunc();
-	setcontext(RCCONTEXT);
+	calcontext(RCCONTEXT);
 					/* option city */
 	for (i = 1; i < argc; i++) {
 						/* expand arguments */
@@ -217,7 +223,7 @@ main(int argc, char *argv[])
 				error(USER, "bad number of processes");
 			break;
 		case 'V':			/* output contributions */
-			bool(2,contrib);
+			check_bool(2,contrib);
 			break;
 		case 'x':			/* x resolution */
 			check(2,"i");
@@ -229,7 +235,7 @@ main(int argc, char *argv[])
 			break;
 		case 'w':			/* warnings */
 			rval = (erract[WARNING].pf != NULL);
-			bool(2,rval);
+			check_bool(2,rval);
 			if (rval) erract[WARNING].pf = wputs;
 			else erract[WARNING].pf = NULL;
 			break;
@@ -240,10 +246,10 @@ main(int argc, char *argv[])
 		case 'l':			/* limit distance */
 			if (argv[i][2] != 'd')
 				goto badopt;
-			bool(3,lim_dist);
+			check_bool(3,lim_dist);
 			break;
 		case 'I':			/* immed. irradiance */
-			bool(2,imm_irrad);
+			check_bool(2,imm_irrad);
 			break;
 		case 'f':			/* file or force or format */
 			if (!argv[i][2]) {
@@ -252,7 +258,7 @@ main(int argc, char *argv[])
 				break;
 			}
 			if (argv[i][2] == 'o') {
-				bool(3,force_open);
+				check_bool(3,force_open);
 				break;
 			}
 			setformat(argv[i]+2);
@@ -266,10 +272,10 @@ main(int argc, char *argv[])
 			accumulate = atoi(argv[++i]);
 			break;
 		case 'r':			/* recover output */
-			bool(2,recover);
+			check_bool(2,recover);
 			break;
 		case 'h':			/* header output */
-			bool(2,header);
+			check_bool(2,header);
 			break;
 		case 'p':			/* parameter setting(s) */
 			check(2,"s");
@@ -292,6 +298,10 @@ main(int argc, char *argv[])
 			check(2,"s");
 			addmodfile(argv[++i], curout, prms, binval, bincnt);
 			break;
+		case 't':			/* reporting interval */
+			check(2,"i");
+			report_intvl = atoi(argv[++i]);
+			break;
 		default:
 			goto badopt;
 		}
@@ -363,14 +373,14 @@ main(int argc, char *argv[])
 
 badopt:
 	fprintf(stderr,
-"Usage: %s [-n nprocs][-V][-r][-e expr][-f source][-o ospec][-p p1=V1,p2=V2][-b binv][-bn N] {-m mod | -M file} [rtrace options] octree\n",
+"Usage: %s [-n nprocs][-V][-c count][-r][-e expr][-f source][-o ospec][-p p1=V1,p2=V2][-b binv][-bn N] {-m mod | -M file} [rtrace options] octree\n",
 			progname);
 	sprintf(errmsg, "command line error at '%s'", argv[i]);
 	error(USER, errmsg);
 	return(1);	/* pro forma return */
 
 #undef	check
-#undef	bool
+#undef	check_bool
 }