--- ray/src/rt/renderopts.c	2003/02/22 02:07:29	2.1
+++ ray/src/rt/renderopts.c	2005/05/31 18:01:09	2.8
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: renderopts.c,v 2.1 2003/02/22 02:07:29 greg Exp $";
+static const char	RCSid[] = "$Id: renderopts.c,v 2.8 2005/05/31 18:01:09 greg Exp $";
 #endif
 /*
  *  renderopts.c - process common rendering options
@@ -7,70 +7,17 @@ static const char	RCSid[] = "$Id: renderopts.c,v 2.1 2
  *  External symbols declared in ray.h
  */
 
-/* ====================================================================
- * The Radiance Software License, Version 1.0
- *
- * Copyright (c) 1990 - 2002 The Regents of the University of California,
- * through Lawrence Berkeley National Laboratory.   All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *         notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *           if any, must include the following acknowledgment:
- *             "This product includes Radiance software
- *                 (http://radsite.lbl.gov/)
- *                 developed by the Lawrence Berkeley National Laboratory
- *               (http://www.lbl.gov/)."
- *       Alternately, this acknowledgment may appear in the software itself,
- *       if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
- *       and "The Regents of the University of California" must
- *       not be used to endorse or promote products derived from this
- *       software without prior written permission. For written
- *       permission, please contact radiance@radsite.lbl.gov.
- *
- * 5. Products derived from this software may not be called "Radiance",
- *       nor may "Radiance" appear in their name, without prior written
- *       permission of Lawrence Berkeley National Laboratory.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
- * information on Lawrence Berkeley National Laboratory, please see
- * <http://www.lbl.gov/>.
- */
+#include "copyright.h"
 
 #include  "ray.h"
+#include  "paths.h"
 
 
-int
-getrenderopt(ac, av)		/* get next render option */
-int  ac;
-char  *av[];
+extern int
+getrenderopt(		/* get next render option */
+	int  ac,
+	char  *av[]
+)
 {
 #define	 check(ol,al)		if (av[0][ol] || \
 				badarg(ac-1,av+1,al)) \
@@ -194,15 +141,15 @@ char  *av[];
 			}
 			if (av[0][2] == 'I') {	/* file */
 				rval = wordfile(amblp,
-					getpath(av[1],getlibpath(),R_OK));
+					getpath(av[1],getrlibpath(),R_OK));
 				if (rval < 0) {
 					sprintf(errmsg,
-			"cannot open ambient include file \"%s\"", av[0]);
+			"cannot open ambient include file \"%s\"", av[1]);
 					error(SYSTEM, errmsg);
 				}
 				amblp += rval;
 			} else {
-				*amblp++ = av[1];
+				*amblp++ = savqstr(av[1]);
 				*amblp = NULL;
 			}
 			return(1);
@@ -215,21 +162,21 @@ char  *av[];
 			}
 			if (av[0][2] == 'E') {	/* file */
 				rval = wordfile(amblp,
-					getpath(av[1],getlibpath(),R_OK));
+					getpath(av[1],getrlibpath(),R_OK));
 				if (rval < 0) {
 					sprintf(errmsg,
-			"cannot open ambient exclude file \"%s\"", av[0]);
+			"cannot open ambient exclude file \"%s\"", av[1]);
 					error(SYSTEM, errmsg);
 				}
 				amblp += rval;
 			} else {
-				*amblp++ = av[1];
+				*amblp++ = savqstr(av[1]);
 				*amblp = NULL;
 			}
 			return(1);
 		case 'f':				/* file */
 			check(3,"s");
-			ambfile= av[1];
+			ambfile = savqstr(av[1]);
 			return(1);
 		}
 		break;
@@ -265,11 +212,9 @@ char  *av[];
 }
 
 
-void
-print_rdefaults()		/* print default render values to stdout */
+extern void
+print_rdefaults(void)		/* print default render values to stdout */
 {
-	register char  *cp;
-
 	printf(do_irrad ? "-i+\t\t\t\t# irradiance calculation on\n" :
 			"-i-\t\t\t\t# irradiance calculation off\n");
 	printf(backvis ? "-bv+\t\t\t\t# back face visibility on\n" :
@@ -300,6 +245,7 @@ print_rdefaults()		/* print default render values to s
 			colval(salbedo,GRN), colval(salbedo,BLU));
 	printf("-mg %f\t\t\t# mist scattering eccentricity\n", seccg);
 	printf("-ms %f\t\t\t# mist sampling distance\n", ssampdist);
-	printf("-lr %-9d\t\t\t# limit reflection\n", maxdepth);
+	printf("-lr %-9d\t\t\t# limit reflection%s\n", maxdepth,
+			maxdepth<=0 ? " (Russian roulette)" : "");
 	printf("-lw %f\t\t\t# limit weight\n", minweight);
 }