--- ray/src/rt/rtrace.c	2005/05/25 04:44:26	2.41
+++ ray/src/rt/rtrace.c	2005/06/05 19:52:01	2.44
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rtrace.c,v 2.41 2005/05/25 04:44:26 greg Exp $";
+static const char	RCSid[] = "$Id: rtrace.c,v 2.44 2005/06/05 19:52:01 greg Exp $";
 #endif
 /*
  *  rtrace.c - program and variables for individual ray tracing.
@@ -74,7 +74,7 @@ double  specjitter = 1.;		/* specular sampling jitter 
 
 int  backvis = 1;			/* back face visibility */
 
-int  maxdepth = 8;			/* maximum recursion depth */
+int  maxdepth = -10;			/* maximum recursion depth */
 double  minweight = 2e-3;		/* minimum ray weight */
 
 char  *ambfile = NULL;			/* ambient file name */
@@ -97,7 +97,7 @@ static putf_t puta, putd, putf;
 
 typedef void oputf_t(RAY *r);
 static oputf_t  oputo, oputd, oputv, oputl, oputL, oputc, oputp,
-		oputn, oputN, oputs, oputw, oputW, oputm, oputM, oputdash;
+		oputn, oputN, oputs, oputw, oputW, oputm, oputM, oputtilde;
 
 static void setoutput(char *vs);
 static void tranotify(OBJECT obj);
@@ -160,10 +160,8 @@ rtrace(				/* trace rays from file */
 		sprintf(errmsg, "cannot open input file \"%s\"", fname);
 		error(SYSTEM, errmsg);
 	}
-#ifdef _WIN32
 	if (inform != 'a')
 		SET_FILE_BINARY(fp);
-#endif
 					/* set up output */
 	setoutput(outvals);
 	switch (outform) {
@@ -213,7 +211,7 @@ rtrace(				/* trace rays from file */
 	}
 	fflush(stdout);
 	if (vcount > 0)
-		error(USER, "read error");
+		error(USER, "unexpected EOF on input");
 	if (fname != NULL)
 		fclose(fp);
 }
@@ -240,9 +238,11 @@ setoutput(				/* set up output tables */
 	while (*vs)
 		switch (*vs++) {
 		case 'T':				/* trace sources */
+			if (!*vs) break;
 			trace_sources();
 			/* fall through */
 		case 't':				/* trace */
+			if (!*vs) break;
 			*table = NULL;
 			table = every_out;
 			trace = ourtrace;
@@ -296,8 +296,8 @@ setoutput(				/* set up output tables */
 		case 'M':				/* material */
 			*table++ = oputM;
 			break;
-		case '-':				/* dash */
-			*table++ = oputdash;
+		case '~':				/* tilde */
+			*table++ = oputtilde;
 			break;
 		}
 	*table = NULL;
@@ -677,12 +677,11 @@ oputM(				/* print material */
 
 
 static void
-oputdash(			/* output dash (spacer) */
+oputtilde(			/* output tilde (spacer) */
 	RAY  *r
 )
 {
-	putchar('-');
-	putchar('\t');
+	fputs("~\t", stdout);
 }