--- ray/src/util/rtcontrib.c	2009/06/14 18:21:58	1.54
+++ ray/src/util/rtcontrib.c	2010/10/10 09:25:04	1.60
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rtcontrib.c,v 1.54 2009/06/14 18:21:58 greg Exp $";
+static const char RCSid[] = "$Id: rtcontrib.c,v 1.60 2010/10/10 09:25:04 greg Exp $";
 #endif
 /*
  * Gather rtrace output to compute contributions from particular sources
@@ -20,7 +20,7 @@ static const char RCSid[] = "$Id: rtcontrib.c,v 1.54 2
 #define	MAXMODLIST	1024		/* maximum modifiers we'll track */
 #endif
 
-int	treebufsiz = BUFSIZ;		/* current tree buffer size */
+size_t	treebufsiz = BUFSIZ;		/* current tree buffer size */
 
 typedef double	DCOLOR[3];		/* double-precision color */
 
@@ -92,9 +92,9 @@ struct rtproc {
 	struct rtproc	*next;		/* next in list of processes */
 	SUBPROC		pd;		/* rtrace pipe descriptors */
 	unsigned long	raynum;		/* ray number for this tree */
-	int		bsiz;		/* ray tree buffer length */
+	size_t		bsiz;		/* ray tree buffer length */
 	char		*buf;		/* ray tree buffer */
-	int		nbr;		/* number of bytes from rtrace */
+	size_t		nbr;		/* number of bytes from rtrace */
 };				/* rtrace process buffer */
 
 					/* rtrace command and defaults */
@@ -378,14 +378,16 @@ main(int argc, char *argv[])
 	rtargv[rtargc++] = contrib ? RTCONTRIB : RTCOEFF;
 				/* just asking for defaults? */
 	if (!strcmp(argv[i], "-defaults")) {
-		char	sxres[16], syres[16];
+		char	nps[8], sxres[16], syres[16];
 		char	*rtpath;
-		printf("-n %-2d\t\t\t\t# number of processes\n", nprocs);
 		printf("-c %-5d\t\t\t# accumulated rays per record\n",
 				accumulate);
 		printf("-V%c\t\t\t\t# output %s\n", contrib ? '+' : '-',
 				contrib ? "contributions" : "coefficients");
 		fflush(stdout);			/* report OUR options */
+		rtargv[rtargc++] = "-n";
+		sprintf(nps, "%d", nprocs);
+		rtargv[rtargc++] = nps;
 		rtargv[rtargc++] = header ? "-h+" : "-h-";
 		sprintf(fmt, "-f%c%c", inpfmt, outfmt);
 		rtargv[rtargc++] = fmt;
@@ -543,7 +545,7 @@ init(int np)
 		raysleft = 0;
 	if ((account = accumulate) > 0)
 		raysleft *= accumulate;
-	waitflush = xres;
+	waitflush = (yres > 0) & (xres > 1) ? 0 : xres;
 	if (!recover)
 		return;
 					/* recover previous values */
@@ -664,6 +666,10 @@ ofname(char *oname, const char *ospec, const char *mna
 				mnp = cp;
 				break;
 			case 'd':
+			case 'i':
+			case 'o':
+			case 'x':
+			case 'X':
 				if (bnp != NULL)
 					return -1;
 				bnp = cp;
@@ -730,8 +736,6 @@ printresolu(FILE *fout, int xr, int yr)
 {
 	if ((xr > 0) & (yr > 0))	/* resolution string */
 		fprtresolu(xr, yr, fout);
-	if (xres > 0)			/* global flush flag */
-		fflush(fout);
 }
 
 /* Get output stream pointer (open and write header if new and noopen==0) */
@@ -752,6 +756,8 @@ getostream(const char *ospec, const char *mname, int b
 			if (header)
 				printheader(stdout, NULL);
 			printresolu(stdout, xres, yres);
+			if (waitflush > 0)
+				fflush(stdout);
 			stdos.xr = xres; stdos.yr = yres;
 			using_stdout = 1;
 		}
@@ -820,7 +826,7 @@ getostream(const char *ospec, const char *mname, int b
 			if (outfmt == 'a')
 				putc('\n', sop->ofp);
 		}
-		if (xres > 0)
+		if (waitflush > 0)
 			fflush(sop->ofp);
 	}
 	sop->reclen += noopen;			/* add to length if noopen */
@@ -987,7 +993,7 @@ done_contrib(int navg)
 	if (using_stdout & (outfmt == 'a'))
 		putc('\n', stdout);
 	if (!waitflush) {
-		waitflush = xres;
+		waitflush = (yres > 0) & (xres > 1) ? 0 : xres;
 		if (using_stdout)
 			fflush(stdout);
 	}
@@ -1069,7 +1075,7 @@ wait_rproc(void)
 {
 	struct rtproc	*rtfree = NULL;
 	fd_set		readset, errset;
-	int		nr;
+	ssize_t		nr;
 	struct rtproc	*rt;
 	int		n;