--- ray/src/common/portio.c	2003/12/09 15:51:42	2.10
+++ ray/src/common/portio.c	2006/12/23 17:27:45	2.14
@@ -1,21 +1,21 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: portio.c,v 2.10 2003/12/09 15:51:42 greg Exp $";
+static const char	RCSid[] = "$Id: portio.c,v 2.14 2006/12/23 17:27:45 greg Exp $";
 #endif
 /*
  * Portable i/o for binary files
  *
- * External symbols declared in standard.h
+ * External symbols declared in rtio.h
  */
 
 #include "copyright.h"
 
-#include <stdio.h>
-
 #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
@@ -48,9 +48,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);
 }
 
@@ -101,6 +110,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)));
 }