--- ray/src/common/portio.c	2003/02/25 02:47:21	2.7
+++ ray/src/common/portio.c	2005/05/03 05:10:13	2.13
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: portio.c,v 2.7 2003/02/25 02:47:21 greg Exp $";
+static const char	RCSid[] = "$Id: portio.c,v 2.13 2005/05/03 05:10:13 greg Exp $";
 #endif
 /*
  * Portable i/o for binary files
@@ -11,12 +11,16 @@ static const char	RCSid[] = "$Id: portio.c,v 2.7 2003/
 
 #include <stdio.h>
 
-#ifndef frexp
-extern double  frexp();
+#include "rtio.h"
+
+#include <math.h>
+
+#ifdef getc_unlocked		/* avoid horrendous overhead of flockfile */
+#undef getc
+#undef putc
+#define getc    getc_unlocked
+#define putc    putc_unlocked
 #endif
-#ifndef ldexp
-extern double  ldexp();
-#endif
 
 
 void
@@ -46,9 +50,18 @@ putflt(f, fp)			/* put out floating point number */
 double	f;
 FILE  *fp;
 {
+	long  m;
 	int  e;
 
-	putint((long)(frexp(f,&e)*0x7fffffff), 4, fp);
+	m = frexp(f, &e) * 0x7fffffff;
+	if (e > 127) {			/* overflow */
+		m = m > 0 ? (long)0x7fffffff : -(long)0x7fffffff;
+		e = 127;
+	} else if (e < -128) {		/* underflow */
+		m = 0;
+		e = 0;
+	}
+	putint(m, 4, fp);
 	putint((long)e, 1, fp);
 }
 
@@ -99,6 +112,10 @@ FILE  *fp;
 	double	d;
 
 	l = getint(4, fp);
+	if (l == 0) {
+		getc(fp);		/* exactly zero -- ignore exponent */
+		return(0.0);
+	}
 	d = (l + (l > 0 ? .5 : -.5)) * (1./0x7fffffff);
 	return(ldexp(d, (int)getint(1, fp)));
 }