--- ray/src/util/ranimate.c	2003/06/06 20:04:06	2.38
+++ ray/src/util/ranimate.c	2003/10/21 19:19:29	2.42
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: ranimate.c,v 2.38 2003/06/06 20:04:06 greg Exp $";
+static const char RCSid[] = "$Id: ranimate.c,v 2.42 2003/10/21 19:19:29 schorsch Exp $";
 #endif
 /*
  * Radiance animation control program
@@ -15,9 +15,11 @@ static const char RCSid[] = "$Id: ranimate.c,v 2.38 20
 
 #include "copyright.h"
 
-#include "standard.h"
 #include <ctype.h>
 #include <sys/stat.h>
+
+#include "standard.h"
+#include "paths.h"
 #include "view.h"
 #include "vars.h"
 #include "netproc.h"
@@ -26,11 +28,7 @@ static const char RCSid[] = "$Id: ranimate.c,v 2.38 20
 #define DEF_NBLUR	5
 #endif
 				/* default remote shell */
-#ifdef _AUX_SOURCE
-#define REMSH		"remsh"
-#else
 #define REMSH		"rsh"
-#endif
 				/* input variables (alphabetical by name) */
 #define ANIMATE		0		/* animation command */
 #define ARCHIVE		1		/* archiving command */
@@ -480,7 +478,7 @@ char	*rfargs;
 			pippt = NULL;
 		}
 	if (pippt != NULL)
-		strcpy(pippt, "> /dev/null");	/* nothing to match */
+		strcpy(pippt, "> " NULL_DEVICE);	/* nothing to match */
 	else {
 		sprintf(cp, ")[ \t]*=' > %s/radset.var", vval(DIRECTORY));
 		cp += 11;		/* point to file name */
@@ -886,7 +884,7 @@ int	rvr;
 		quit(1);
 	}
 	usepinterp = (nblur > 1);
-	usepfilt = pfiltalways | ep==NULL;
+	usepfilt = pfiltalways | (ep==NULL);
 	if (ep != NULL && !strcmp(ep, "1"))
 		ep = "+0";
 	nora_rgbe = strcmp(vval(OVERSAMP),"1") || ep==NULL ||
@@ -1033,7 +1031,7 @@ int	n;
 			fclose(viewfp);
 			viewfp = NULL;
 			viewnum = 0;
-			copystruct(&curview, &stdview);
+			curview = stdview;
 		}
 		return(NULL);
 	}
@@ -1049,7 +1047,7 @@ int	n;
 			perror(vval(VIEWFILE));
 			quit(1);
 		}
-		copystruct(&curview, &stdview);
+		curview = stdview;
 		viewnum = 0;
 	}
 	if (n < 0) {				/* get next view */
@@ -1393,7 +1391,7 @@ register char	*path;
 	for (i = 0, psep = -1; path[i]; i++)
 		if (path[i] == '/')
 			psep = i;
-	if (df != NULL)
+	if (df != NULL) {
 		if (psep == 0) {
 			df[0] = '/';
 			df[1] = '\0';
@@ -1402,6 +1400,7 @@ register char	*path;
 			df[psep] = '\0';
 		} else
 			df[0] = '\0';
+	}
 	return(path+psep+1);
 }