--- ray/src/util/ranimove.c	2003/02/22 02:07:30	3.1
+++ ray/src/util/ranimove.c	2003/07/21 22:30:19	3.6
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: ranimove.c,v 3.1 2003/02/22 02:07:30 greg Exp $";
+static const char RCSid[] = "$Id";
 #endif
 /*
  *  Radiance object animation program
@@ -9,67 +9,18 @@ static const char	RCSid[] = "$Id: ranimove.c,v 3.1 200
  *  See ranimove.h and the ranimove(1) man page for details.
  */
 
-/* ====================================================================
- * 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 "ranimove.h"
-#include <sys/time.h>
+#include <time.h>
+#ifndef _WIN32
+  #include <sys/time.h>
+#endif
 #include <ctype.h>
+#include <string.h>
 
+#include "paths.h"
+#include "ranimove.h"
+
 int		NVARS = NV_INIT; /* total number of variables */
 
 VARIABLE	vv[] = VV_INIT;	/* variable-value pairs */
@@ -296,7 +247,7 @@ setdefaults()			/* set default values */
 	setrendparams(lorendoptf, vval(LOWQ));
 	ray_save(&lorendparams);
 	curparams = &lorendparams;
-	twolevels = bcmp(&lorendparams, &hirendparams, sizeof(RAYPARAMS));
+	twolevels = memcmp(&lorendparams, &hirendparams, sizeof(RAYPARAMS));
 }
 
 
@@ -437,7 +388,7 @@ char	*rfargs;
 			pippt = NULL;
 		}
 	if (pippt != NULL)
-		strcpy(pippt, "> /dev/null");	/* nothing to match */
+		strcpy(pippt, "> " NULL_DEVICE);	/* nothing to match */
 	else {
 		strcpy(cp, ")[ \t]*=' > ranimove.var");
 		cp += 11;		/* point to file name */
@@ -505,7 +456,7 @@ int	n;
 			fclose(viewfp);
 			viewfp = NULL;
 			viewnum = 0;
-			copystruct(&curview, &stdview);
+			curview = stdview;
 		}
 		return(NULL);
 	}
@@ -521,7 +472,7 @@ int	n;
 			perror(vval(VIEWFILE));
 			quit(1);
 		}
-		copystruct(&curview, &stdview);
+		curview = stdview;
 		viewnum = 0;
 	}
 	if (n < 0) {				/* get next view */
@@ -810,11 +761,12 @@ int	n;
 		om->cprio = om->prio;
 	}
 					/* XXX bxfm relies on call order */
-	if (framestep)
+	if (framestep) {
 		if (invmat4(om->bxfm, om->cxfm))
 			multmat4(om->bxfm, om->bxfm, oxf.xfm);
 		else
 			setident4(om->bxfm);
+	}
 					/* all done */
 	return(xfp);
 }