--- ray/src/util/rcollate.c	2022/01/20 17:35:03	2.38
+++ ray/src/util/rcollate.c	2022/03/16 18:01:47	2.41
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rcollate.c,v 2.38 2022/01/20 17:35:03 greg Exp $";
+static const char RCSid[] = "$Id: rcollate.c,v 2.41 2022/03/16 18:01:47 greg Exp $";
 #endif
 /*
  * Utility to re-order records in a binary or ASCII data file (matrix)
@@ -33,8 +33,22 @@ typedef struct {
 	char	*rec[1];	/* record array (extends struct) */
 } RECINDEX;
 
-int		warnings = 1;	/* report warnings? */
+int		warnings = 1;			/* report warnings? */
 
+char		*fmtid = NULL;			/* format id */
+int		comp_size = 0;			/* binary bytes/channel */
+int		n_comp = 0;			/* components/record */
+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? */
+int		outArray[MAXLEVELS][2];		/* output block nesting */
+int		outLevels = 0;			/* number of blocking levels */
+int		check = 0;			/* force data check? */
+
 /* free loaded file */
 static void
 free_load(MEMLOAD *mp)
@@ -183,8 +197,7 @@ index_records(const MEMLOAD *mp, int nw_rec)
 					break;	/* got requisite # words */
 				do {		/* else find next word */
 					if (*cp == '\n') {
-						fprintf(stderr,
-						"Unexpected EOL in record!\n");
+						fputs("Unexpected EOL in record!\n", stderr);
 						free_records(rp);
 						return(NULL);
 					}
@@ -220,12 +233,16 @@ count_columns(const RECINDEX *rp)
 static int
 print_record(const RECINDEX *rp, ssize_t n)
 {
-	int	words2go = rp->nw_rec;
-	char	*scp;
+	static char	delims[] = " \t\n\r\f";
+	int		words2go = rp->nw_rec;
+	char		*scp;
 
 	if ((n < 0) | (n >= rp->nrecs))
 		return(0);
 	scp = rp->rec[n];
+
+	if (check && !isfltd(scp, delims))
+		goto formerr;
 	do {
 		putc(*scp++, stdout);
 		if (!*scp | isspace(*scp)) {
@@ -236,10 +253,19 @@ print_record(const RECINDEX *rp, ssize_t n)
 				if (++scp >= rp->rec[n+1])
 					break;
 			while (!*scp | isspace(*scp));
+
+			if (check && !isfltd(scp, delims))
+				goto formerr;
 		}
 	} while (scp < rp->rec[n+1]);
 						/* caller adds record sep. */
 	return(1);
+formerr:
+	fputs("Badly formed number: ", stderr);
+	while (*scp && !isspace(*scp))
+		fputc(*scp++, stderr);
+	fputc('\n', stderr);
+	return(0);
 }
 
 /* copy a stream to stdout */
@@ -281,20 +307,6 @@ fget_word(char buf[256], FILE *fp)
 	return(buf);
 }
 
-char		*fmtid = NULL;			/* format id */
-int		comp_size = 0;			/* binary bytes/channel */
-int		n_comp = 0;			/* components/record */
-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? */
-int		outArray[MAXLEVELS][2];		/* output block nesting */
-int		outLevels = 0;			/* number of blocking levels */
-int		check = 0;			/* force data check? */
-
 /* parse RxCx... string */
 static int
 get_array(const char *spec, int blklvl[][2], int nlvls)
@@ -456,6 +468,7 @@ do_reorder(const MEMLOAD *mp)
 	if (o_header) {				/* finish header? */
 		printf("NROWS=%d\n", no_rows);
 		printf("NCOLS=%d\n", no_columns);
+		fputformat(fmtid, stdout);
 		fputc('\n', stdout);
 	}
 						/* reorder records */
@@ -467,7 +480,8 @@ do_reorder(const MEMLOAD *mp)
 			return(0);
 		}
 		if (rp != NULL) {		/* ASCII output */
-			print_record(rp, n);
+			if (!print_record(rp, n))
+				return(0);
 			putc(tabEOL[j >= no_columns-1], stdout);
 		} else {			/* binary output */
 			putbinary((char *)mp->base + (n_comp*comp_size)*n,
@@ -475,7 +489,7 @@ do_reorder(const MEMLOAD *mp)
 		}
 	    }
 	    if (ferror(stdout)) {
-		fprintf(stderr, "Error writing to stdout\n");
+		fputs("Error writing to stdout\n", stderr);
 		return(0);
 	    }
 	}
@@ -483,11 +497,11 @@ do_reorder(const MEMLOAD *mp)
 		free_records(rp);
 	return(1);
 badspec:
-	fprintf(stderr, "Bad dimension(s)\n");
+	fputs("Bad dimension(s)\n", stderr);
 	return(0);
 }
 
-/* resize ASCII stream input by ignoring EOLs between records */
+/* resize stream input by ignoring EOLs between ASCII records */
 static int
 do_resize(FILE *fp)
 {
@@ -500,6 +514,7 @@ do_resize(FILE *fp)
 			printf("NROWS=%d\n", no_rows);
 		if (no_columns > 0)
 			printf("NCOLS=%d\n", no_columns);
+		fputformat(fmtid, stdout);
 		fputc('\n', stdout);
 	}
 						/* sanity checks */
@@ -507,7 +522,7 @@ do_resize(FILE *fp)
 			(no_columns == ni_columns) & (no_rows == ni_rows))
 		return(output_stream(fp));	/* no-op -- just copy */
 	if (no_columns <= 0) {
-		fprintf(stderr, "Missing -oc specification\n");
+		fputs("Missing -oc specification\n", stderr);
 		return(0);
 	}
 	if ((records2go <= 0) & (no_rows > 0))
@@ -527,6 +542,12 @@ do_resize(FILE *fp)
 					break;
 				goto done;	/* normal EOD */
 			}
+			if (check && !isflt(word)) {
+				fputs("Badly formed number: ", stderr);
+				fputs(word, stderr);
+				fputc('\n', stderr);
+				return(0);
+			}
 			fputs(word, stdout);
 			if (n) {		/* mid-record? */
 				int	c = getc(fp);
@@ -537,7 +558,7 @@ do_resize(FILE *fp)
 			}
 		}
 		if (n >= 0) {
-			fprintf(stderr, "Incomplete record / unexpected EOF\n");
+			fputs("Incomplete record / unexpected EOF\n", stderr);
 			return(0);
 		}
 		if (--columns2go <= 0) {	/* time to end output row? */
@@ -548,9 +569,9 @@ do_resize(FILE *fp)
 	} while (--records2go);			/* expected EOD? */
 done:
 	if (warnings && columns2go != no_columns)
-		fprintf(stderr, "Warning -- incomplete final row\n");
+		fputs("Warning -- incomplete final row\n", stderr);
 	if (warnings && fget_word(word, fp) != NULL)
-		fprintf(stderr, "Warning -- characters beyond expected EOD\n");
+		fputs("Warning -- characters beyond expected EOD\n", stderr);
 	return(1);
 }
 
@@ -702,6 +723,10 @@ main(int argc, char *argv[])
 		SET_FILE_BINARY(stdin);
 		SET_FILE_BINARY(stdout);
 	}
+#ifdef getc_unlocked				/* avoid stupid semaphores */
+	flockfile(stdin);
+	flockfile(stdout);
+#endif
 						/* check for no-op */
 	if (!transpose & !check & (outLevels <= 1) & (i_header == o_header) &&
 			(no_columns == ni_columns) & (no_rows == ni_rows)) {
@@ -728,7 +753,6 @@ main(int argc, char *argv[])
 			newheader("RADIANCE", stdout);
 		printargs(a, argv, stdout);
 		printf("NCOMP=%d\n", n_comp);
-		fputformat(fmtid, stdout);
 	}
 	if (transpose | check | (outLevels > 1) || (o_header && no_rows <= 0)) {
 		MEMLOAD	myMem;			/* need to map into memory */