--- ray/src/rt/renderopts.c 2003/05/13 17:58:33 2.3 +++ ray/src/rt/renderopts.c 2004/08/13 22:57:56 2.6 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: renderopts.c,v 2.3 2003/05/13 17:58:33 greg Exp $"; +static const char RCSid[] = "$Id: renderopts.c,v 2.6 2004/08/13 22:57:56 greg Exp $"; #endif /* * renderopts.c - process common rendering options @@ -10,12 +10,14 @@ static const char RCSid[] = "$Id: renderopts.c,v 2.3 2 #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)) \ @@ -147,7 +149,7 @@ char *av[]; } amblp += rval; } else { - *amblp++ = av[1]; + *amblp++ = savqstr(av[1]); *amblp = NULL; } return(1); @@ -168,13 +170,13 @@ char *av[]; } 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; @@ -210,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" :