--- ray/src/rt/lookamb.c	1991/06/07 10:04:27	1.4
+++ ray/src/rt/lookamb.c	1992/10/15 21:13:13	2.4
@@ -12,13 +12,17 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  <stdio.h>
 
+#ifdef MSDOS
+#include  <fcntl.h>
+#endif
+
 #include  "color.h"
 
 #include  "ambient.h"
 
 
 int  dataonly = 0;
-
+int  header = 1;
 int  reverse = 0;
 
 AMBVAL  av;
@@ -39,6 +43,9 @@ char  *argv[];
 			case 'r':
 				reverse = 1;
 				break;
+			case 'h':
+				header = 0;
+				break;
 			default:
 				fprintf(stderr, "%s: unknown option '%s'\n",
 						argv[0], argv[i]);
@@ -53,29 +60,55 @@ char  *argv[];
 		fprintf(stderr, "%s: file not found\n", argv[i]);
 		return(1);
 	}
-	if (reverse)
+	if (reverse) {
+		if (header) {
+			if (checkheader(fp, "ascii", stdout) < 0)
+				goto formaterr;
+		} else
+			printargs(argc, argv, stdout);
+		fputformat(AMBFMT, stdout);
+		putchar('\n');
+#ifdef MSDOS
+		setmode(fileno(stdout), O_BINARY);
+#endif
+		putambmagic(stdout);
 		writamb(fp);
-	else
+	} else {
+#ifdef MSDOS
+		setmode(fileno(fp), O_BINARY);
+#endif
+		if (checkheader(fp, AMBFMT, header ? stdout : (FILE *)NULL) < 0)
+			goto formaterr;
+		if (!hasambmagic(fp))
+			goto formaterr;
+		if (header) {
+			fputformat("ascii", stdout);
+			putchar('\n');
+		}
 		lookamb(fp);
+	}
 	fclose(fp);
 	return(0);
+formaterr:
+	fprintf(stderr, "%s: format error on input\n", argv[0]);
+	exit(1);
 }
 
 
 lookamb(fp)			/* get ambient values from a file */
 FILE  *fp;
 {
-	while (fread((char *)&av, sizeof(AMBVAL), 1, fp) == 1) {
+	while (readambval(&av, fp)) {
 		if (dataonly) {
 			printf("%f\t%f\t%f\t", av.pos[0], av.pos[1], av.pos[2]);
 			printf("%f\t%f\t%f\t", av.dir[0], av.dir[1], av.dir[2]);
 			printf("%d\t%f\t%f\t", av.lvl, av.weight, av.rad);
-			printf("%e\t%e\t%e\n", colval(av.val,RED),
+			printf("%e\t%e\t%e\t", colval(av.val,RED),
 						colval(av.val,GRN),
 						colval(av.val,BLU));
 			printf("%f\t%f\t%f\t", av.gpos[0],
 					av.gpos[1], av.gpos[2]);
-			printf("%f\t%f\t%f\t", av.gdir[0],
+			printf("%f\t%f\t%f\n", av.gdir[0],
 					av.gdir[1], av.gdir[2]);
 		} else {
 			printf("\nPosition:\t%f\t%f\t%f\n", av.pos[0],
@@ -132,7 +165,7 @@ FILE  *fp;
 				&av.gdir[0], &av.gdir[1], &av.gdir[2]) != 3)
 			return;
 		av.next = NULL;
-		fwrite((char *)&av, sizeof(AMBVAL), 1, stdout);
+		writambval(&av, stdout);
 		if (ferror(stdout))
 			exit(1);
 	}