--- ray/src/util/getinfo.c	2014/07/28 17:25:03	2.10
+++ ray/src/util/getinfo.c	2019/07/16 17:07:35	2.19
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: getinfo.c,v 2.10 2014/07/28 17:25:03 greg Exp $";
+static const char	RCSid[] = "$Id: getinfo.c,v 2.19 2019/07/16 17:07:35 greg Exp $";
 #endif
 /*
  *  getinfo.c - program to read info. header from file.
@@ -11,19 +11,18 @@ static const char	RCSid[] = "$Id: getinfo.c,v 2.10 201
 #include  <string.h>
 
 #include  "platform.h"
+#include  "rtprocess.h"
 #include  "resolu.h"
 
 #ifdef getc_unlocked		/* avoid nasty file-locking overhead */
+#undef getc
 #undef getchar
 #undef putchar
+#define getc		getc_unlocked
 #define getchar		getchar_unlocked
 #define putchar		putchar_unlocked
 #endif
 
-#ifdef _WIN32
-#define	execvp	_execvp
-#endif
-
 static gethfunc tabstr;
 static void getdim(FILE *fp);
 static void copycat(void);
@@ -55,24 +54,60 @@ main(
 	FILE  *fp;
 	int  i;
 
-	if (argc > 1 && !strcmp(argv[1], "-d")) {
+	if (argc > 1 && (argv[1][0] == '-') | (argv[1][0] == '+') &&
+			argv[1][1] == 'd') {
+		dim = 1 - 2*(argv[1][0] == '-');
 		argc--; argv++;
-		dim = 1;
-		SET_FILE_BINARY(stdin);
-	} else if (argc > 2 && !strcmp(argv[1], "-c")) {
-		SET_FILE_BINARY(stdin);
+	}
+#ifdef getc_unlocked				/* avoid lock/unlock overhead */
+	flockfile(stdin);
+#endif
+	SET_FILE_BINARY(stdin);
+	if (argc > 2 && !strcmp(argv[1], "-c")) {
 		SET_FILE_BINARY(stdout);
-		getheader(stdin, (gethfunc *)fputs, stdout);
+		setvbuf(stdin, NULL, _IONBF, 2);
+		if (getheader(stdin, (gethfunc *)fputs, stdout) < 0)
+			return 1;
 		printargs(argc-2, argv+2, stdout);
 		fputc('\n', stdout);
+		if (dim) {			/* copy resolution string? */
+			RESOLU	rs;
+			if (!fgetsresolu(&rs, stdin)) {
+				fputs("No resolution string\n", stderr);
+				return 1;
+			}
+			if (dim > 0)
+				fputsresolu(&rs, stdout);
+		}
 		fflush(stdout);
 		execvp(argv[2], argv+2);
 		perror(argv[2]);
 		return 1;
+	} else if (argc > 2 && !strcmp(argv[1], "-a")) {
+		SET_FILE_BINARY(stdout);
+		if (getheader(stdin, (gethfunc *)fputs, stdout) < 0)
+			return 1;
+		for (i = 2; i < argc; i++) {
+			int	len = strlen(argv[i]);
+			if (!len) continue;
+			fputs(argv[i], stdout);
+			if (argv[i][len-1] != '\n')
+				fputc('\n', stdout);
+		}
+		fputc('\n', stdout);
+		copycat();
+		return 0;
 	} else if (argc == 2 && !strcmp(argv[1], "-")) {
-		SET_FILE_BINARY(stdin);
 		SET_FILE_BINARY(stdout);
-		getheader(stdin, NULL, NULL);
+		if (getheader(stdin, NULL, NULL) < 0)
+			return 1;
+		if (dim < 0) {			/* skip resolution string? */
+			RESOLU	rs;
+			if (!fgetsresolu(&rs, stdin)) {
+				fputs("No resolution string\n", stderr);
+				return 1;
+			}
+		}
 		copycat();
 		return 0;
 	}
@@ -81,23 +116,37 @@ main(
 		if ((fp = fopen(argv[i], "r")) == NULL)
 			fputs(": cannot open\n", stdout);
 		else {
-			if (dim) {
+			if (dim < 0) {			/* dimensions only */
+				if (getheader(fp, NULL, NULL) < 0) {
+					fputs("bad header\n", stdout);
+					continue;	
+				}
 				fputs(": ", stdout);
 				getdim(fp);
 			} else {
 				tabstr(":\n", NULL);
-				getheader(fp, tabstr, NULL);
+				if (getheader(fp, tabstr, NULL) < 0)
+					return 1;
 				fputc('\n', stdout);
+				if (dim > 0) {
+					fputc('\t', stdout);
+					getdim(fp);
+				}
 			}
 			fclose(fp);
 		}
 	}
 	if (argc == 1) {
-		if (dim) {
+		if (dim < 0) {
+			if (getheader(stdin, NULL, NULL) < 0)
+				return 1;	
 			getdim(stdin);
 		} else {
-			getheader(stdin, (gethfunc *)fputs, stdout);
+			if (getheader(stdin, (gethfunc *)fputs, stdout) < 0)
+				return 1;
 			fputc('\n', stdout);
+			if (dim > 0)
+				getdim(stdin);
 		}
 	}
 	return 0;
@@ -112,8 +161,6 @@ getdim(				/* get dimensions from file */
 	int  j;
 	int  c;
 
-	getheader(fp, NULL, NULL);	/* skip header */
-
 	switch (c = getc(fp)) {
 	case '+':		/* picture */
 	case '-':
@@ -145,10 +192,10 @@ static void
 copycat(void)			/* copy input to output */
 {
 	char	buf[8192];
-	ssize_t	n;
+	int	n;
 
 	fflush(stdout);
 	while ((n = fread(buf, 1, sizeof(buf), stdin)) > 0)
-		if (write(fileno(stdout), buf, n) != n)
+		if (writebuf(fileno(stdout), buf, n) != n)
 			break;
 }