--- ray/src/rt/ambient.c	1992/07/16 14:03:27	2.8
+++ ray/src/rt/ambient.c	1992/07/16 16:47:28	2.10
@@ -41,8 +41,6 @@ double  minarad;		/* minimum ambient radius */
 static AMBTREE  atrunk;		/* our ambient trunk node */
 
 static FILE  *ambfp = NULL;	/* ambient file pointer */
-static char  *afname;		/* ambient file name */
-static long  ambheadlen;	/* length of ambient file header */
 
 #define  AMBFLUSH	(BUFSIZ/AMBVALSIZ)
 
@@ -51,6 +49,7 @@ static long  ambheadlen;	/* length of ambient file hea
 #define  newambtree()	(AMBTREE *)calloc(8, sizeof(AMBTREE))
 
 extern long  ftell(), lseek();
+static int  initambfile(), avsave(), avinsert(), ambsync();
 
 
 setambres(ar)				/* set ambient resolution */
@@ -74,19 +73,21 @@ int  ar;
 setambient(afile)			/* initialize calculation */
 char  *afile;
 {
+	long  headlen;
 	AMBVAL  amb;
 						/* init ambient limits */
 	setambres(ambres);
 						/* open ambient file */
-	if ((afname = afile) != NULL)
+	if (afile != NULL)
 		if ((ambfp = fopen(afile, "r+")) != NULL) {
 			initambfile(0);
+			headlen = ftell(ambfp);
 			while (readambval(&amb, ambfp))
 				avinsert(&amb, &atrunk, thescene.cuorg,
 						thescene.cusize);
 							/* align */
-			fseek(ambfp, -((ftell(ambfp)-ambheadlen)%AMBVALSIZ), 1);
-		} else if ((ambfp = fopen(afile, "w")) != NULL)
+			fseek(ambfp, -((ftell(ambfp)-headlen)%AMBVALSIZ), 1);
+		} else if ((ambfp = fopen(afile, "w+")) != NULL)
 			initambfile(1);
 		else {
 			sprintf(errmsg, "cannot open ambient file \"%s\"",
@@ -96,34 +97,6 @@ char  *afile;
 }
 
 
-initambfile(creat)		/* initialize ambient file */
-int  creat;
-{
-	extern char  *progname, *octname, VersionID[];
-
-	setbuf(ambfp, bmalloc(BUFSIZ));
-	if (creat) {			/* new file */
-		fprintf(ambfp, "%s -av %g %g %g -ab %d -aa %g ",
-				progname, colval(ambval,RED),
-				colval(ambval,GRN), colval(ambval,BLU),
-				ambounce, ambacc);
-		fprintf(ambfp, "-ad %d -as %d -ar %d %s\n",
-				ambdiv, ambssamp, ambres,
-				octname==NULL ? "" : octname);
-		fprintf(ambfp, "SOFTWARE= %s\n", VersionID);
-		fputformat(AMBFMT, ambfp);
-		putc('\n', ambfp);
-		putambmagic(ambfp);
-		fflush(ambfp);
-	} else if (checkheader(ambfp, AMBFMT, NULL) < 0
-			|| !hasambmagic(ambfp)) {
-		sprintf(errmsg, "\"%s\" is not an ambient file", afname);
-		error(USER, errmsg);
-	}
-	ambheadlen = ftell(ambfp);
-}
-
-
 ambnotify(obj)			/* record new modifier */
 OBJECT  obj;
 {
@@ -332,6 +305,31 @@ FVECT  pv, nv;
 
 
 static
+initambfile(creat)		/* initialize ambient file */
+int  creat;
+{
+	extern char  *progname, *octname, VersionID[];
+
+	setbuf(ambfp, bmalloc(BUFSIZ));
+	if (creat) {			/* new file */
+		fprintf(ambfp, "%s -av %g %g %g -ab %d -aa %g ",
+				progname, colval(ambval,RED),
+				colval(ambval,GRN), colval(ambval,BLU),
+				ambounce, ambacc);
+		fprintf(ambfp, "-ad %d -as %d -ar %d %s\n",
+				ambdiv, ambssamp, ambres,
+				octname==NULL ? "" : octname);
+		fprintf(ambfp, "SOFTWARE= %s\n", VersionID);
+		fputformat(AMBFMT, ambfp);
+		putc('\n', ambfp);
+		putambmagic(ambfp);
+		fflush(ambfp);
+	} else if (checkheader(ambfp, AMBFMT, NULL) < 0 || !hasambmagic(ambfp))
+		error(USER, "bad ambient file");
+}
+
+
+static
 avsave(av)				/* insert and save an ambient value */
 AMBVAL  *av;
 {
@@ -390,14 +388,26 @@ memerr:
 }
 
 
-#include  <fcntl.h>
+#ifdef  NIX
 
+static
+ambsync()			/* flush ambient file */
+{
+	return(fflush(ambfp));
+}
 
+#else
+
+#include  <fcntl.h>
+#include  <sys/types.h>
+#include  <sys/stat.h>
+
 static
 ambsync()			/* synchronize ambient file */
 {
 	static FILE  *ambinp = NULL;
 	struct flock  fls;
+	struct stat  sts;
 	AMBVAL  avs;
 	long  lastpos, flen;
 	register int  n;
@@ -409,21 +419,24 @@ ambsync()			/* synchronize ambient file */
 	if (fcntl(fileno(ambfp), F_SETLKW, &fls) < 0)
 		error(SYSTEM, "cannot lock ambient file");
 				/* see if file has grown */
-	lastpos = lseek(fileno(ambfp), 0L, 2);	/* may move pointer */
-	flen = lseek(fileno(ambfp), 0L, 1);	/* new(?) file length */
-	if (n = (flen - lastpos)%AMBVALSIZ)	/* assure alignment */
-		lseek(fileno(ambfp), flen -= n, 0);
+	lastpos = lseek(fileno(ambfp), 0L, 1);	/* get previous position */
+	if (fstat(fileno(ambfp), &sts) < 0)	/* get current length */
+		error(SYSTEM, "cannot stat ambient file");
+	flen = sts.st_size;
 	if (n = (flen - lastpos)/AMBVALSIZ) {	/* file has grown */
-		if (ambinp == NULL && (ambinp = fopen(afname, "r")) == NULL)
-			error(SYSTEM, "cannot reopen ambient file");
-		fseek(ambinp, lastpos, 0);	/* go to previous position */
+		if (ambinp == NULL)		/* use duplicate file */
+			ambinp = fdopen(dup(fileno(ambfp)), "r");
 		while (n--) {			/* load contributed values */
 			readambval(&avs, ambinp);
 			avinsert(&avs,&atrunk,thescene.cuorg,thescene.cusize);
-		}
+		}				/* moves shared file pointer */
+		if (n = (flen - lastpos)%AMBVALSIZ)	/* alignment */
+			lseek(fileno(ambfp), flen-n, 0);
 	}
 	n = fflush(ambfp);			/* calls write() at last */
 	fls.l_type = F_UNLCK;			/* release file */
 	fcntl(fileno(ambfp), F_SETLKW, &fls);
 	return(n);
 }
+
+#endif