--- ray/src/util/rcollate.c	2014/09/18 00:12:42	2.19
+++ ray/src/util/rcollate.c	2018/10/20 15:02:51	2.29
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rcollate.c,v 2.19 2014/09/18 00:12:42 greg Exp $";
+static const char RCSid[] = "$Id: rcollate.c,v 2.29 2018/10/20 15:02:51 greg Exp $";
 #endif
 /*
  * Utility to re-order records in a binary or ASCII data file (matrix)
@@ -11,26 +11,19 @@ static const char RCSid[] = "$Id: rcollate.c,v 2.19 20
 #include "platform.h"
 #include "rtio.h"
 #include "resolu.h"
-#ifdef _WIN32
-#undef ftello
-#define	ftello	ftell
-#undef ssize_t
-#define ssize_t	size_t
+#if defined(_WIN32) || defined(_WIN64)
+  #undef ftello
+  #define	ftello	ftell
+  #undef ssize_t
+  #define ssize_t	size_t
 #else
-#include <sys/mman.h>
+  #include <sys/mman.h>
 #endif
 
-#ifdef getc_unlocked            /* avoid horrendous overhead of flockfile */
-#undef getc
-#undef putc
-#define getc    getc_unlocked
-#define putc    putc_unlocked
-#endif
-
 typedef struct {
+	void	*mapped;	/* memory-mapped pointer */
 	void	*base;		/* pointer to base memory */
 	size_t	len;		/* allocated memory length */
-	int	mapped;		/* memory-mapped file? */
 } MEMLOAD;		/* file loaded/mapped into memory */
 
 typedef struct {
@@ -49,56 +42,15 @@ free_load(MEMLOAD *mp)
 		return;
 #ifdef MAP_FILE
 	if (mp->mapped)
-		munmap(mp->base, mp->len);
+		munmap(mp->mapped, mp->len);
 	else
 #endif
 		free(mp->base);
+	mp->mapped = NULL;
 	mp->base = NULL;
 	mp->len = 0;
 }
 
-/* load a file into memory */
-static int
-load_file(MEMLOAD *mp, FILE *fp)
-{
-	int	fd;
-	off_t	skip, flen;
-
-	if (mp == NULL)
-		return(-1);
-	mp->base = NULL;
-	mp->len = 0;
-	mp->mapped = 0;
-	if (fp == NULL)
-		return(-1);
-	fd = fileno(fp);
-	skip = ftello(fp);
-	flen = lseek(fd, 0, SEEK_END);
-	if (flen <= skip)
-		return((int)(flen - skip));
-	mp->len = (size_t)(flen - skip);
-#ifdef MAP_FILE
-	if (mp->len > 1L<<20) {		/* map file if > 1 MByte */
-		mp->base = mmap(NULL, mp->len, PROT_READ, MAP_PRIVATE, fd, skip);
-		if (mp->base != MAP_FAILED) {
-			mp->mapped = 1;
-			return(1);	/* mmap() success */
-		}
-		mp->base = NULL;	/* fall back to reading it in... */
-	}
-#endif
-	if (lseek(fd, skip, SEEK_SET) != skip ||
-			(mp->base = malloc(mp->len)) == NULL) {
-		mp->len = 0;
-		return(-1);
-	}
-	if (read(fd, (char *)mp->base, mp->len) != mp->len) {
-		free_load(mp);
-		return(-1);
-	}
-	return(1);
-}
-
 /* load memory from an input stream, starting from current position */
 static int
 load_stream(MEMLOAD *mp, FILE *fp)
@@ -109,14 +61,14 @@ load_stream(MEMLOAD *mp, FILE *fp)
 
 	if (mp == NULL)
 		return(-1);
+	mp->mapped = NULL;
 	mp->base = NULL;
 	mp->len = 0;
-	mp->mapped = 0;
 	if (fp == NULL)
 		return(-1);
 	while ((nr = fread(buf, 1, sizeof(buf), fp)) > 0) {
 		if (!alloced)
-			mp->base = malloc(nr);
+			mp->base = malloc(alloced = nr);
 		else if (mp->len+nr > alloced)
 			mp->base = realloc(mp->base,
 				alloced = alloced*(2+(nr==sizeof(buf)))/2+nr);
@@ -134,6 +86,58 @@ load_stream(MEMLOAD *mp, FILE *fp)
 	return(mp->len > 0);
 }
 
+/* load a file into memory */
+static int
+load_file(MEMLOAD *mp, FILE *fp)
+{
+	int	fd;
+	off_t	skip, flen, fpos;
+
+#if defined(_WIN32) || defined(_WIN64)
+				/* too difficult to fix this */
+	return load_stream(mp, fp);
+#endif
+	if (mp == NULL)
+		return(-1);
+	mp->mapped = NULL;
+	mp->base = NULL;
+	mp->len = 0;
+	if (fp == NULL)
+		return(-1);
+	fd = fileno(fp);
+	skip = ftello(fp);
+	flen = lseek(fd, 0, SEEK_END);
+	if (flen <= skip)
+		return((int)(flen - skip));
+	mp->len = (size_t)(flen - skip);
+#ifdef MAP_FILE
+	if (mp->len > 1L<<20) {		/* map file if > 1 MByte */
+		mp->mapped = mmap(NULL, flen, PROT_READ, MAP_PRIVATE, fd, 0);
+		if (mp->mapped != MAP_FAILED) {
+			mp->base = (char *)mp->mapped + skip;
+			return(1);	/* mmap() success */
+		}
+		mp->mapped = NULL;	/* else fall back to reading it in... */
+	}
+#endif
+	if (lseek(fd, skip, SEEK_SET) != skip ||
+			(mp->base = malloc(mp->len)) == NULL) {
+		mp->len = 0;
+		return(-1);
+	}
+	fpos = skip;
+	while (fpos < flen) {		/* read() fails if n > 2 GBytes */
+		ssize_t	nread = read(fd, (char *)mp->base+(fpos-skip),
+				(flen-fpos < 1L<<24) ? flen-fpos : 1L<<24);
+		if (nread <= 0) {
+			free_load(mp);
+			return(-1);
+		}
+		fpos += nread;
+	}
+	return(1);
+}
+
 /* free a record index */
 #define free_records(rp)	free(rp)
 
@@ -141,6 +145,7 @@ load_stream(MEMLOAD *mp, FILE *fp)
 static RECINDEX *
 index_records(const MEMLOAD *mp, int nw_rec)
 {
+	int		nall = 0;
 	RECINDEX	*rp;
 	char		*cp, *mend;
 	int		n;
@@ -149,7 +154,8 @@ index_records(const MEMLOAD *mp, int nw_rec)
 		return(NULL);
 	if (nw_rec <= 0)
 		return(NULL);
-	rp = (RECINDEX *)malloc(sizeof(RECINDEX) + mp->len/(2*nw_rec)*sizeof(char *));
+	nall = 1000;
+	rp = (RECINDEX *)malloc(sizeof(RECINDEX) + nall*sizeof(char *));
 	if (rp == NULL)
 		return(NULL);
 	rp->nw_rec = nw_rec;
@@ -161,6 +167,13 @@ index_records(const MEMLOAD *mp, int nw_rec)
 			++cp;
 		if (cp >= mend)
 			break;
+		if (rp->nrecs >= nall) {
+			nall += nall>>1;	/* get more record space */
+			rp = (RECINDEX *)realloc(rp,
+					sizeof(RECINDEX) + nall*sizeof(char *));
+			if (rp == NULL)
+				return(NULL);
+		}
 		rp->rec[rp->nrecs++] = cp;	/* point to first non-white */
 		n = rp->nw_rec;
 		while (++cp < mend)		/* find end of record */
@@ -356,9 +369,9 @@ do_transpose(const MEMLOAD *mp)
 			print_record(rp, j*ni_columns + i);
 			putc(tabEOL[j >= no_columns-1], stdout);
 		} else {			/* binary output */
-			fwrite((char *)mp->base +
-					(n_comp*comp_size)*(j*ni_columns + i),
-					n_comp*comp_size, 1, stdout);
+			putbinary((char *)mp->base +
+				(size_t)(n_comp*comp_size)*(j*ni_columns + i),
+					comp_size, n_comp, stdout);
 		}
 	    if (ferror(stdout)) {
 		fprintf(stderr, "Error writing to stdout\n");
@@ -435,7 +448,7 @@ done:
 static int
 headline(char *s, void *p)
 {
-	static char	fmt[32];
+	static char	fmt[MAXFMTLEN];
 	int		n;
 
 	if (formatval(fmt, s)) {