--- ray/src/util/getinfo.c	2003/06/05 19:29:35	2.6
+++ ray/src/util/getinfo.c	2012/06/09 04:24:16	2.9
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: getinfo.c,v 2.6 2003/06/05 19:29:35 schorsch Exp $";
+static const char	RCSid[] = "$Id: getinfo.c,v 2.9 2012/06/09 04:24:16 greg Exp $";
 #endif
 /*
  *  getinfo.c - program to read info. header from file.
@@ -8,14 +8,29 @@ static const char	RCSid[] = "$Id: getinfo.c,v 2.6 2003
  */
 
 #include  <stdio.h>
+#include  <string.h>
 
 #include  "platform.h"
+#include  "resolu.h"
 
+#ifdef getc_unlocked		/* avoid nasty file-locking overhead */
+#undef getchar
+#undef putchar
+#define getchar		getchar_unlocked
+#define putchar		putchar_unlocked
+#endif
 
 
-int
-tabstr(s)				/* put out line followed by tab */
-register char  *s;
+static gethfunc tabstr;
+static void getdim(register FILE *fp);
+static void copycat(void);
+
+
+static int
+tabstr(				/* put out line followed by tab */
+	register char  *s,
+	void *p
+)
 {
 	while (*s) {
 		putchar(*s);
@@ -27,9 +42,11 @@ register char  *s;
 }
 
 
-main(argc, argv)
-int  argc;
-char  **argv;
+int
+main(
+	int  argc,
+	char  **argv
+)
 {
 	int  dim = 0;
 	FILE  *fp;
@@ -45,7 +62,7 @@ char  **argv;
 		SET_FILE_BINARY(stdout);
 		getheader(stdin, NULL, NULL);
 		copycat();
-		exit(0);
+		return 0;
 	}
 	for (i = 1; i < argc; i++) {
 		fputs(argv[i], stdout);
@@ -56,26 +73,29 @@ char  **argv;
 				fputs(": ", stdout);
 				getdim(fp);
 			} else {
-				tabstr(":\n");
+				tabstr(":\n", NULL);
 				getheader(fp, tabstr, NULL);
 				putchar('\n');
 			}
 			fclose(fp);
 		}
 	}
-	if (argc == 1)
+	if (argc == 1) {
 		if (dim) {
 			getdim(stdin);
 		} else {
-			getheader(stdin, fputs, stdout);
+			getheader(stdin, (gethfunc*)fputs, stdout);
 			putchar('\n');
 		}
-	exit(0);
+	}
+	return 0;
 }
 
 
-getdim(fp)				/* get dimensions from file */
-register FILE  *fp;
+static void
+getdim(				/* get dimensions from file */
+	register FILE  *fp
+)
 {
 	int  j;
 	register int  c;
@@ -109,7 +129,8 @@ register FILE  *fp;
 }
 
 
-copycat()			/* copy input to output */
+static void
+copycat(void)			/* copy input to output */
 {
 	register int	c;