--- ray/src/rt/ambient.c 2007/09/13 20:13:16 2.63 +++ ray/src/rt/ambient.c 2007/09/15 02:47:30 2.65 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: ambient.c,v 2.63 2007/09/13 20:13:16 greg Exp $"; +static const char RCSid[] = "$Id: ambient.c,v 2.65 2007/09/15 02:47:30 greg Exp $"; #endif /* * ambient.c - routines dealing with ambient (inter-reflected) component. @@ -876,6 +876,8 @@ ambsync(void) /* synchronize ambient file */ AMBVAL avs; register int n; + if (ambfp == NULL) /* no ambient file? */ + return(0); if (lastpos < 0) /* initializing (locked in initambfile) */ goto syncend; /* gain appropriate access */ @@ -902,9 +904,10 @@ ambsync(void) /* synchronize ambient file */ avinsert(avstore(&avs)); n -= AMBVALSIZ; } + lastpos = flen - n; /*** seek always as safety measure if (n) ***/ /* alignment */ - if (lseek(fileno(ambfp), (off_t)(flen-n), SEEK_SET) < 0) + if (lseek(fileno(ambfp), (off_t)lastpos, SEEK_SET) < 0) goto seekerr; } #ifdef DEBUG @@ -917,8 +920,11 @@ ambsync(void) /* synchronize ambient file */ #endif syncend: n = fflush(ambfp); /* calls write() at last */ - if ((lastpos = lseek(fileno(ambfp), (off_t)0, SEEK_CUR)) < 0) - goto seekerr; + if ((n == EOF) | (lastpos < 0)) { + if ((lastpos = lseek(fileno(ambfp), (off_t)0, SEEK_CUR)) < 0) + goto seekerr; + } else + lastpos += (long)nunflshed*AMBVALSIZ; aflock(F_UNLCK); /* release file */ nunflshed = 0; return(n); @@ -932,6 +938,8 @@ seekerr: extern int ambsync(void) /* flush ambient file */ { + if (ambfp == NULL) + return(0); nunflshed = 0; return(fflush(ambfp)); }