--- ray/src/gen/mkillum.c	1992/11/19 20:27:48	2.5
+++ ray/src/gen/mkillum.c	1997/10/20 16:37:14	2.10
@@ -1,4 +1,4 @@
-/* Copyright (c) 1991 Regents of the University of California */
+/* Copyright (c) 1995 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -30,7 +30,8 @@ char  *rtargv[64] = { "rtrace", "-dj", ".25", "-dr", "
 		"-ab", "2", "-ad", "256", "-as", "128", "-aa", ".15", };
 int  rtargc = 14;
 				/* overriding rtrace options */
-char  *myrtopts[] = { "-I-", "-i-", "-ov", "-h-", "-fff", "-y", "0", NULL };
+char  *myrtopts[] = { "-I-", "-i-", "-ld-", "-ov", "-h-",
+			"-fff", "-y", "0", NULL };
 
 struct rtproc	rt;		/* our rtrace process */
 
@@ -76,11 +77,27 @@ char	*argv[];
 	gargv = argv;
 				/* set up rtrace command */
 	for (i = 1; i < argc; i++) {
-		if (argv[i][0] == '<' && !argv[i][1])
+		if (argv[i][0] == '<' && argv[i][1] == '\0')
 			break;
 		rtargv[rtargc++] = argv[i];
 		if (argv[i][0] == '-' && argv[i][1] == 'w')
-			warnings = !warnings;
+			switch (argv[i][2]) {
+			case '\0':
+				warnings = !warnings;
+				break;
+			case '+':
+			case 'T': case 't':
+			case 'Y': case 'y':
+			case '1':
+				warnings = 1;
+				break;
+			case '-':
+			case 'F': case 'f':
+			case 'N': case 'n':
+			case '0':
+				warnings = 0;
+				break;
+			}
 	}
 	gargc = i;
 	rtargc--;
@@ -164,7 +181,7 @@ init()				/* start rtrace and set up buffers */
 		error(SYSTEM, "out of memory in init");
 	rt.nrays = 0;
 					/* set up urand */
-	initurand(2048);
+	initurand(16384);
 }
 
 
@@ -247,7 +264,7 @@ char	*nm;
 		case 'm':			/* material name */
 			if (*++cp != '=')
 				break;
-			if (!*++cp)
+			if (!*++cp || isspace(*cp))
 				break;
 			atos(thisillum.matname, MAXSTR, cp);
 			cp = sskip(cp);
@@ -259,7 +276,7 @@ char	*nm;
 		case 'f':			/* data file name */
 			if (*++cp != '=')
 				break;
-			if (!*++cp) {
+			if (!*++cp || isspace(*cp)) {
 				strcpy(thisillum.datafile,thisillum.matname);
 				thisillum.dfnum = 0;
 				thisillum.flags &= ~IL_DATCLB;
@@ -345,7 +362,7 @@ char	*nm;
 		case 'o':			/* output file */
 			if (*++cp != '=')
 				break;
-			if (!*++cp)
+			if (!*++cp || isspace(*cp))
 				break;
 			atos(buf, sizeof(buf), cp);
 			cp = sskip(cp);
@@ -363,7 +380,8 @@ char	*nm;
 			return;
 		}
 	opterr:					/* skip faulty option */
-		cp = sskip(cp);
+		while (*cp && !isspace(*cp))
+			cp++;
 		nerrs++;
 	}
 						/* print header? */