--- ray/src/px/x11image.c	1993/10/27 13:03:18	2.29
+++ ray/src/px/x11image.c	1993/10/28 10:00:58	2.31
@@ -350,16 +350,22 @@ char **argv;
 quiterr(err)		/* print message and exit */
 char  *err;
 {
-	if (err != NULL)
+	register int  es;
+	int  cs;
+
+	if (es = err != NULL)
 		fprintf(stderr, "%s: %s: %s\n", progname, 
 				fname==NULL?"<stdin>":fname, err);
-	if (wind) {
+	if (parent > 0 & wind != 0) {
 		XDestroyWindow(thedisplay, wind);
 		XFlush(thedisplay);
 	}
-	while (parent > 0 && wait(0) != -1)	/* wait for any children */
+	while (parent > 0 && wait(&cs) != -1) {	/* wait for any children */
+		if (es == 0)
+			es = cs>>8 & 0xff;
 		parent--;
-	exit(err != NULL);
+	}
+	exit(es);
 }
 
 
@@ -970,13 +976,16 @@ getgrey()			/* get greyscale data */
 getmapped()			/* get color-mapped data */
 {
 	int	y;
+					/* make sure we can do it first */
+	if (fname == NULL)
+		quiterr("cannot map colors from standard input");
 					/* set gamma correction */
 	setcolrgam(gamcor);
 					/* make histogram */
 	new_histo();
 	for (y = 0; y < ymax; y++) {
 		if (getscan(y) < 0)
-			quiterr("seek error in getmapped");
+			break;
 		add2icon(y, scanline);
 		if (scale)
 			shiftcolrs(scanline, xmax, scale);
@@ -987,8 +996,7 @@ getmapped()			/* get color-mapped data */
 	if (!new_clrtab(maxcolors))
 		quiterr("cannot create color map");
 	for (y = 0; y < ymax; y++) {
-		if (getscan(y) < 0)
-			quiterr("seek error in getmapped");
+		getscan(y);
 		if (scale)
 			shiftcolrs(scanline, xmax, scale);
 		colrs_gambs(scanline, xmax);
@@ -1031,6 +1039,12 @@ double	sf;
 getscan(y)
 int  y;
 {
+	static int  trunced = -1;		/* truncated file? */
+skipit:
+	if (trunced >= 0 && y >= trunced) {
+		bzero(scanline, xmax*sizeof(COLR));
+		return(-1);
+	}
 	if (y != cury) {
 		if (scanpos == NULL || scanpos[y] == -1)
 			return(-1);
@@ -1040,9 +1054,12 @@ int  y;
 	} else if (scanpos != NULL && scanpos[y] == -1)
 		scanpos[y] = ftell(fin);
 
-	if (freadcolrs(scanline, xmax, fin) < 0)
-		quiterr("read error");
-
+	if (freadcolrs(scanline, xmax, fin) < 0) {
+		fprintf(stderr, "%s: %s: unfinished picture\n",
+				progname, fname==NULL?"<stdin>":fname);
+		trunced = y;
+		goto skipit;
+	}
 	cury++;
 	return(0);
 }