--- ray/src/util/ranimate.c	1996/07/30 21:27:13	2.21
+++ ray/src/util/ranimate.c	1998/02/26 10:27:45	2.24
@@ -150,6 +150,8 @@ char	*argv[];
 	cfname = argv[i];
 						/* load variables */
 	loadvars(cfname);
+						/* check variables */
+	checkvalues();
 						/* did we get DIRECTORY? */
 	checkdir();
 						/* check status */
@@ -448,28 +450,39 @@ char	*rfargs;
 	char	combuf[256];
 	register int	i;
 	register char	*cp;
+	char	*pippt;
 					/* create rad command */
 	sprintf(rendopt, " @%s/render.opt", vval(DIRECTORY));
 	sprintf(combuf,
 	"rad -v 0 -s -e -w %s OPTFILE=%s | egrep '^[ \t]*(NOMATCH",
 			rfargs, rendopt+2);
 	cp = combuf;
-	while (*cp) cp++;		/* match unset variables */
+	while (*cp) {
+		if (*cp == '|') pippt = cp;
+		cp++;
+	}				/* match unset variables */
 	for (i = 0; mvar[i] >= 0; i++)
 		if (!vdef(mvar[i])) {
 			*cp++ = '|';
 			strcpy(cp, vnam(mvar[i]));
 			while (*cp) cp++;
+			pippt = NULL;
 		}
-	sprintf(cp, ")[ \t]*=' > %s/radset.var", vval(DIRECTORY));
-	cp += 11;			/* point to file name */
+	if (pippt != NULL)
+		strcpy(pippt, "> /dev/null");	/* nothing to match */
+	else {
+		sprintf(cp, ")[ \t]*=' > %s/radset.var", vval(DIRECTORY));
+		cp += 11;		/* point to file name */
+	}
 	if (system(combuf)) {
 		fprintf(stderr, "%s: error executing rad command:\n\t%s\n",
 				progname, combuf);
 		quit(1);
 	}
-	loadvars(cp);			/* load variables and remove file */
-	unlink(cp);
+	if (pippt == NULL) {		/* load variables and remove file */
+		loadvars(cp);
+		unlink(cp);
+	}
 }
 
 
@@ -972,12 +985,12 @@ int	n;
 		}
 		return(NULL);
 	}
-	if (viewfp == NULL) {		/* open file */
+	if (viewfp == NULL) {			/* open file */
 		if ((viewfp = fopen(vval(VIEWFILE), "r")) == NULL) {
 			perror(vval(VIEWFILE));
 			quit(1);
 		}
-	} else if (n < viewnum) {	/* rewind file */
+	} else if (n > 0 && n < viewnum) {	/* rewind file */
 		if (viewnum == 1 && feof(viewfp))
 			return(&curview);		/* just one view */
 		if (fseek(viewfp, 0L, 0) == EOF) {
@@ -987,6 +1000,13 @@ int	n;
 		copystruct(&curview, &stdview);
 		viewnum = 0;
 	}
+	if (n < 0) {				/* get next view */
+		register int	c = getc(viewfp);
+		if (c == EOF)
+			return((VIEW *)NULL);		/* that's it */
+		ungetc(c, viewfp);
+		n = viewnum + 1;
+	}
 	while (n > viewnum) {		/* scan to desired view */
 		if (fgets(linebuf, sizeof(linebuf), viewfp) == NULL)
 			return(viewnum==1 ? &curview : (VIEW *)NULL);
@@ -1000,9 +1020,11 @@ int	n;
 int
 countviews()			/* count views in view file */
 {
-	register int	n = 0;
+	int	n;
 
-	while (getview(n+1) != NULL)
+	if (getview(n=1) == NULL)
+		return(0);
+	while (getview(-1) != NULL)
 		n++;
 	return(n);
 }