--- ray/src/util/rcollate.c	2014/05/30 16:50:43	2.10
+++ ray/src/util/rcollate.c	2014/07/09 21:45:48	2.16
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rcollate.c,v 2.10 2014/05/30 16:50:43 greg Exp $";
+static const char RCSid[] = "$Id: rcollate.c,v 2.16 2014/07/09 21:45:48 greg Exp $";
 #endif
 /*
  * Utility to re-order records in a binary or ASCII data file (matrix)
@@ -237,11 +237,11 @@ output_stream(FILE *fp)
 
 	if (fp == NULL)
 		return(0);
-	fflush(stdout);			/* assumes nothing in input buffer */
-	while ((n = read(fileno(fp), buf, sizeof(buf))) > 0)
+	fflush(stdout);
+	while ((n = fread(buf, 1, sizeof(buf), fp)) > 0)
 		if (write(fileno(stdout), buf, n) != n)
 			return(0);
-	return(n >= 0);
+	return(!ferror(fp));
 }
 
 /* get next word from stream, leaving stream on EOL or start of next word */
@@ -274,9 +274,12 @@ int		ni_columns = 0;			/* number of input columns */
 int		ni_rows = 0;			/* number of input rows */
 int		no_columns = 0;			/* number of output columns */
 int		no_rows = 0;			/* number of output rows */
+int		transpose = 0;			/* transpose rows & cols? */
+int		i_header = 1;			/* input header? */
+int		o_header = 1;			/* output header? */
 
 /* check settings and assign defaults */
-static void
+static int
 check_sizes()
 {
 	if (fmtid == NULL) {
@@ -288,9 +291,20 @@ check_sizes()
 			comp_size = sizeof(double);
 		else if (!strcmp(fmtid, "byte"))
 			comp_size = 1;
+		else if (strcmp(fmtid, "ascii")) {
+			fprintf(stderr, "Unsupported format: %s\n", fmtid);
+			return(0);
+		}
 	}
+	if (transpose && (no_rows <= 0) & (no_columns <= 0)) {
+		if (ni_rows > 0) no_columns = ni_rows;
+		if (ni_columns > 0) no_rows = ni_columns;
+	} else if ((no_rows <= 0) & (no_columns > 0) &&
+			!((ni_rows*ni_columns) % no_columns))
+		no_rows = ni_rows*ni_columns/no_columns;
 	if (n_comp <= 0)
 		n_comp = 3;
+	return(1);
 }
 
 /* output transposed ASCII or binary data from memory */
@@ -367,10 +381,8 @@ do_resize(FILE *fp)
 	int	columns2go = no_columns;
 	char	word[256];
 						/* sanity checks */
-	if (comp_size) {
-		fputs("Bad call to do_resize (binary input)\n", stderr);
-		return(0);
-	}
+	if (comp_size)
+		return(output_stream(fp));	/* binary data -- just copy */
 	if (no_columns <= 0) {
 		fprintf(stderr, "Missing -oc specification\n");
 		return(0);
@@ -457,13 +469,14 @@ headline(char *s, void *p)
 	if (!strncmp(s, "NCOMP=", 6)) {
 		n = atoi(s+6);
 		if ((n_comp > 0) & (n != n_comp)) {
-			fputs("Incorrect number of components", stderr);
+			fputs("Incorrect number of components\n", stderr);
 			return(-1);
 		}
 		n_comp = n;
 		return(0);
 	}
-	fputs(s, stdout);			/* copy header info. */
+	if (o_header)
+		fputs(s, stdout);		/* copy header info. */
 	return(0);
 }
 
@@ -471,31 +484,28 @@ headline(char *s, void *p)
 int
 main(int argc, char *argv[])
 {
-	int	i_header = 1;			/* input header? */
-	int	o_header = 1;			/* output header? */
-	int	transpose = 0;			/* transpose rows & cols? */
-	int	i;
+	int	a;
 
-	for (i = 1; i < argc && argv[i][0] == '-'; i++)
-		switch (argv[i][1]) {
+	for (a = 1; a < argc && argv[a][0] == '-'; a++)
+		switch (argv[a][1]) {
 		case 'i':			/* input */
-			if (argv[i][2] == 'c')	/* columns */
-				ni_columns = atoi(argv[++i]);
-			else if (argv[i][2] == 'r')
-				ni_rows = atoi(argv[++i]);
+			if (argv[a][2] == 'c')	/* columns */
+				ni_columns = atoi(argv[++a]);
+			else if (argv[a][2] == 'r')
+				ni_rows = atoi(argv[++a]);
 			else
 				goto userr;
 			break;
 		case 'o':			/* output */
-			if (argv[i][2] == 'c')	/* columns */
-				no_columns = atoi(argv[++i]);
-			else if (argv[i][2] == 'r')
-				no_rows = atoi(argv[++i]);
+			if (argv[a][2] == 'c')	/* columns */
+				no_columns = atoi(argv[++a]);
+			else if (argv[a][2] == 'r')
+				no_rows = atoi(argv[++a]);
 			else
 				goto userr;
 			break;
 		case 'h':			/* turn off header */
-			switch (argv[i][2]) {
+			switch (argv[a][2]) {
 			case 'i':
 				i_header = 0;
 				break;
@@ -513,7 +523,7 @@ main(int argc, char *argv[])
 			transpose = !transpose;
 			break;
 		case 'f':			/* format */
-			switch (argv[i][2]) {
+			switch (argv[a][2]) {
 			case 'a':		/* ASCII */
 			case 'A':
 				fmtid = "ascii";
@@ -537,11 +547,12 @@ main(int argc, char *argv[])
 			default:
 				goto userr;
 			}
-			if (argv[i][3]) {
-				if (!isdigit(argv[i][3]))
+			if (argv[a][3]) {
+				if (!isdigit(argv[a][3]))
 					goto userr;
-				n_comp = atoi(argv[i]+3);
-			}
+				n_comp = atoi(argv[a]+3);
+			} else
+				n_comp = 1;
 			break;
 		case 'w':			/* warnings on/off */
 			warnings = !warnings;
@@ -549,11 +560,11 @@ main(int argc, char *argv[])
 		default:
 			goto userr;
 		}
-	if (i < argc-1)				/* arg count OK? */
+	if (a < argc-1)				/* arg count OK? */
 		goto userr;
 						/* open input file? */
-	if (i == argc-1 && freopen(argv[i], "r", stdin) == NULL) {
-		fprintf(stderr, "%s: cannot open for reading\n", argv[i]);
+	if (a == argc-1 && freopen(argv[a], "r", stdin) == NULL) {
+		fprintf(stderr, "%s: cannot open for reading\n", argv[a]);
 		return(1);
 	}
 	if (comp_size) {
@@ -561,7 +572,7 @@ main(int argc, char *argv[])
 		SET_FILE_BINARY(stdout);
 	}
 						/* check for no-op */
-	if (!transpose && (comp_size ||
+	if (!transpose & (i_header == o_header) && (comp_size ||
 			(no_columns == ni_columns) & (no_rows == ni_rows))) {
 		if (warnings)
 			fprintf(stderr, "%s: no-op -- copying input verbatim\n",
@@ -571,21 +582,18 @@ main(int argc, char *argv[])
 		return(0);
 	}
 	if (i_header) {				/* read header */
-		if (getheader(stdin, &headline, NULL) < 0)
+		if (getheader(stdin, headline, NULL) < 0)
 			return(1);
-		check_sizes();
+		if (!check_sizes())
+			return(1);
 		if (comp_size) {		/* a little late... */
 			SET_FILE_BINARY(stdin);
 			SET_FILE_BINARY(stdout);
 		}
-	} else
-		check_sizes();
+	} else if (!check_sizes())
+		return(1);
 	if (o_header) {				/* write header */
-		printargs(argc, argv, stdout);
-		if (transpose && (no_rows <= 0) & (no_columns <= 0)) {
-			if (ni_rows > 0) no_columns = ni_rows;
-			if (ni_columns > 0) no_rows = ni_columns;
-		}
+		printargs(a, argv, stdout);
 		if (no_rows > 0)
 			printf("NROWS=%d\n", no_rows);
 		if (no_columns > 0)
@@ -596,10 +604,10 @@ main(int argc, char *argv[])
 	}
 	if (transpose) {			/* transposing rows & columns? */
 		MEMLOAD	myMem;			/* need to load into memory */
-		if (i == argc-1) {
+		if (a == argc-1) {
 			if (load_file(&myMem, stdin) <= 0) {
 				fprintf(stderr, "%s: error loading file into memory\n",
-						argv[i]);
+						argv[a]);
 				return(1);
 			}
 		} else if (load_stream(&myMem, stdin) <= 0) {