--- ray/src/util/getinfo.c	2004/01/02 11:44:24	2.8
+++ ray/src/util/getinfo.c	2018/03/20 18:18:39	2.16
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: getinfo.c,v 2.8 2004/01/02 11:44:24 schorsch Exp $";
+static const char	RCSid[] = "$Id: getinfo.c,v 2.16 2018/03/20 18:18:39 greg Exp $";
 #endif
 /*
  *  getinfo.c - program to read info. header from file.
@@ -11,16 +11,26 @@ static const char	RCSid[] = "$Id: getinfo.c,v 2.8 2004
 #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
+
 static gethfunc tabstr;
-static void getdim(register FILE *fp);
+static void getdim(FILE *fp);
 static void copycat(void);
 
 
 static int
 tabstr(				/* put out line followed by tab */
-	register char  *s,
+	char  *s,
 	void *p
 )
 {
@@ -47,8 +57,32 @@ main(
 	if (argc > 1 && !strcmp(argv[1], "-d")) {
 		argc--; argv++;
 		dim = 1;
-		SET_DEFAULT_BINARY(); /* for output file */
 		SET_FILE_BINARY(stdin);
+	} else if (argc > 2 && !strcmp(argv[1], "-c")) {
+		SET_FILE_BINARY(stdin);
+		SET_FILE_BINARY(stdout);
+		setvbuf(stdin, NULL, _IONBF, 2);
+		getheader(stdin, (gethfunc *)fputs, stdout);
+		printargs(argc-2, argv+2, stdout);
+		fputc('\n', stdout);
+		fflush(stdout);
+		execvp(argv[2], argv+2);
+		perror(argv[2]);
+		return 1;
+	} else if (argc > 2 && !strcmp(argv[1], "-a")) {
+		SET_FILE_BINARY(stdin);
+		SET_FILE_BINARY(stdout);
+		getheader(stdin, (gethfunc *)fputs, stdout);
+		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);
@@ -67,7 +101,7 @@ main(
 			} else {
 				tabstr(":\n", NULL);
 				getheader(fp, tabstr, NULL);
-				putchar('\n');
+				fputc('\n', stdout);
 			}
 			fclose(fp);
 		}
@@ -76,8 +110,8 @@ main(
 		if (dim) {
 			getdim(stdin);
 		} else {
-			getheader(stdin, (gethfunc*)fputs, stdout);
-			putchar('\n');
+			getheader(stdin, (gethfunc *)fputs, stdout);
+			fputc('\n', stdout);
 		}
 	}
 	return 0;
@@ -86,11 +120,11 @@ main(
 
 static void
 getdim(				/* get dimensions from file */
-	register FILE  *fp
+	FILE  *fp
 )
 {
 	int  j;
-	register int  c;
+	int  c;
 
 	getheader(fp, NULL, NULL);	/* skip header */
 
@@ -105,13 +139,13 @@ getdim(				/* get dimensions from file */
 		getc(fp);
 		j = 0;
 		while ((c = getc(fp)) != EOF)
-			if (c == 0)
+			if (c == 0) {
 				if (++j >= 4)
 					break;
-				else
-					putchar(' ');
-			else
+				putchar(' ');
+			} else {
 				putchar(c);
+			}
 		putchar('\n');
 		break;
 	default:		/* ??? */
@@ -124,8 +158,11 @@ getdim(				/* get dimensions from file */
 static void
 copycat(void)			/* copy input to output */
 {
-	register int	c;
+	char	buf[8192];
+	int	n;
 
-	while ((c = getchar()) != EOF)
-		putchar(c);
+	fflush(stdout);
+	while ((n = fread(buf, 1, sizeof(buf), stdin)) > 0)
+		if (writebuf(fileno(stdout), buf, n) != n)
+			break;
 }