--- ray/src/util/findglare.c	1994/03/06 12:52:58	2.7
+++ ray/src/util/findglare.c	2003/02/22 02:07:30	2.9
@@ -1,9 +1,6 @@
-/* Copyright (c) 1991 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: findglare.c,v 2.9 2003/02/22 02:07:30 greg Exp $";
 #endif
-
 /*
  * Find glare sources in a scene or image.
  *
@@ -16,8 +13,8 @@ static char SCCSid[] = "$SunId$ LBL";
 #define VEQ(v1,v2)	(FEQ((v1)[0],(v2)[0])&&FEQ((v1)[1],(v2)[1]) \
 				&&FEQ((v1)[2],(v2)[2]))
 
-char	*rtargv[32] = {"rtrace", "-h-", "-ov", "-fff"};
-int	rtargc = 4;
+char	*rtargv[64] = {"rtrace", "-h-", "-ov", "-fff", "-ld-", "-i-", "-I-"};
+int	rtargc = 7;
 
 VIEW	ourview = STDVIEW;		/* our view */
 VIEW	pictview = STDVIEW;		/* picture view */
@@ -56,12 +53,13 @@ char	*argv[];
 					/* process options */
 	for (i = 1; i < argc && argv[i][0] == '-'; i++) {
 						/* expand arguments */
-		while (rval = expandarg(&argc, &argv, i))
-			if (rval < 0) {
-				fprintf(stderr, "%s: cannot expand '%s'",
-						argv[0], argv[i]);
-				exit(1);
-			}
+		while ((rval = expandarg(&argc, &argv, i)) > 0)
+			;
+		if (rval < 0) {
+			fprintf(stderr, "%s: cannot expand '%s'",
+					argv[0], argv[i]);
+			exit(1);
+		}
 		rval = getviewopt(&ourview, argc-i, argv+i);
 		if (rval >= 0) {
 			i += rval;
@@ -112,12 +110,14 @@ char	*argv[];
 			combine = !combine;
 			break;
 		case 'd':
-			if (argv[i][2] == 'v') {
-				rtargv[rtargc++] = argv[i];
+			rtargv[rtargc++] = argv[i];
+			if (argv[i][2] != 'v')
+				rtargv[rtargc++] = argv[++i];
+			break;
+		case 'l':
+			if (argv[i][2] == 'd')
 				break;
-			}
 			/* FALL THROUGH */
-		case 'l':
 		case 's':
 		case 'P':
 			rtargv[rtargc++] = argv[i];