--- ray/src/cal/rcalc.c	2005/02/16 17:20:22	1.17
+++ ray/src/cal/rcalc.c	2005/06/02 04:47:27	1.18
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rcalc.c,v 1.17 2005/02/16 17:20:22 greg Exp $";
+static const char RCSid[] = "$Id: rcalc.c,v 1.18 2005/06/02 04:47:27 greg Exp $";
 #endif
 /*
  *  rcalc.c - record calculator program.
@@ -189,10 +189,14 @@ char  *argv[]
 				break;
 			case 'd':
 				bocols = 1;
+				SET_FILE_BINARY(stdout);
 				break;
 			case 'f':
 				bocols = -1;
+				SET_FILE_BINARY(stdout);
 				break;
+			default:
+				goto userr;
 			}
 			break;
 		case 'w':
@@ -208,7 +212,8 @@ char  *argv[]
 eputs(" [-b][-l][-n][-p][-w][-u][-tS][-s svar=sval][-e expr][-f source][-i infmt][-o outfmt] [file]\n");
 			quit(1);
 		}
-
+	if (bocols)
+		SET_FILE_BINARY(stdout);
 	if (noinput) {          /* produce a single output record */
 		if (i < argc) {
 			eputs(argv[0]);
@@ -219,6 +224,8 @@ eputs(" [-b][-l][-n][-p][-w][-u][-tS][-s svar=sval][-e
 		putout();
 		quit(0);
 	}
+	if (nbicols)
+		SET_FILE_BINARY(stdin);
 
 	if (blnkeq)             /* for efficiency */
 		nbsynch();