--- ray/src/rt/devmain.c	1990/03/06 17:44:44	1.10
+++ ray/src/rt/devmain.c	2023/02/09 21:54:11	2.6
@@ -1,25 +1,20 @@
-/* Copyright (c) 1989 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: devmain.c,v 2.6 2023/02/09 21:54:11 greg Exp $";
 #endif
-
 /*
  *  devmain.c - main for independent drivers.
  *
  *	Redefine your initialization routine to dinit.
- *
- *	10/25/89
  */
 
-#include <stdio.h>
+#include "copyright.h"
 
+#include "standard.h"
+
 #include "color.h"
 
 #include "driver.h"
 
-int	(*wrnvec)(), (*errvec)(), (*cmdvec)();	/* error vectors, unused */
-
 struct driver	*dev = NULL;			/* output device */
 
 FILE	*devin, *devout;			/* communications channels */
@@ -44,24 +39,25 @@ char	*argv[];
 						/* set up I/O */
 	progname = argv[0];
 	if (argc < 3) {
-		stderr_v("arg count\n");
+		eputs("arg count\n");
 		quit(1);
 	}
 	devin = fdopen(atoi(argv[1]), "r");
 	devout = fdopen(atoi(argv[2]), "w");
 	if (devin == NULL || devout == NULL || getw(devin) != COM_SENDM) {
-		stderr_v("connection failure\n");
+		eputs("connection failure\n");
 		quit(1);
 	}
 						/* open device */
 	if ((dev = dinit(argv[0], argv[3])) == NULL)
 		quit(1);
 	putw(COM_RECVM, devout);		/* verify initialization */
+	sendstate();
 	fflush(devout);
 						/* loop on requests */
 	while ((com = getc(devin)) != EOF) {
 		if (com >= NREQUESTS || dev_func[com] == NULL) {
-			stderr_v("invalid request\n");
+			eputs("invalid request\n");
 			quit(1);
 		}
 		(*dev_func[com])();		/* process request */
@@ -70,6 +66,7 @@ char	*argv[];
 }
 
 
+void
 quit(code)				/* close device and exit */
 int	code;
 {
@@ -94,7 +91,7 @@ r_paintr()				/* paint a rectangle */
 	COLOR	col;
 	int	xmin, ymin, xmax, ymax;
 
-	fread((char *)col, sizeof(COLOR), 1, devin);
+	getbinary((char *)col, sizeof(COLOR), 1, devin);
 	xmin = getw(devin); ymin = getw(devin);
 	xmax = getw(devin); ymax = getw(devin);
 	(*dev->paintr)(col, xmin, ymin, xmax, ymax);
@@ -106,10 +103,7 @@ r_flush()				/* flush output */
 	if (dev->flush != NULL)
 		(*dev->flush)();
 	putc(COM_FLUSH, devout);
-	fwrite((char *)&dev->pixaspect, sizeof(dev->pixaspect), 1, devout);
-	putw(dev->xsiz, devout);
-	putw(dev->ysiz, devout);
-	putw(dev->inpready, devout);
+	sendstate();
 	fflush(devout);
 }
 
@@ -133,6 +127,27 @@ r_getcur()				/* get and return cursor position */
 }
 
 
+void
+mygets(char *s, FILE *fp)			/* get string from file (with nul) */
+{
+	int	c;
+
+	while ((c = getc(fp)) != EOF)
+		if ((*s++ = c) == '\0')
+			return;
+	*s = '\0';
+}
+
+
+void
+myputs(const char *s, FILE *fp)			/* put string to file (with nul) */
+{
+	do
+		putc(*s, fp);
+	while (*s++);
+}
+
+
 r_comout()				/* print string to command line */
 {
 	char	str[256];
@@ -156,46 +171,34 @@ r_comin()				/* read string from command line */
 					/* reply */
 	putc(COM_COMIN, devout);
 	myputs(buf, devout);
-	putw(dev->inpready, devout);
+	sendstate();
 	fflush(devout);
 }
 
 
-mygets(s, fp)				/* get string from file (with nul) */
-register char	*s;
-register FILE	*fp;
+void
+eputs(const char *s)				/* put string to stderr */
 {
-	register int	c;
+	static int  midline = 0;
 
-	while ((c = getc(fp)) != EOF)
-		if ((*s++ = c) == '\0')
-			return;
-	*s = '\0';
-}
-
-
-myputs(s, fp)				/* put string to file (with nul) */
-register char	*s;
-register FILE	*fp;
-{
-	do
-		putc(*s, fp);
-	while (*s++);
-}
-
-
-stderr_v(s)				/* put string to stderr */
-register char  *s;
-{
-	static int  inline = 0;
-
-	if (!inline++) {
+	if (!*s)
+		return;
+	if (!midline++) {
 		fputs(progname, stderr);
 		fputs(": ", stderr);
 	}
 	fputs(s, stderr);
-	if (*s && s[strlen(s)-1] == '\n') {
+	if (s[strlen(s)-1] == '\n') {
 		fflush(stderr);
-		inline = 0;
+		midline = 0;
 	}
+}
+
+
+sendstate()				/* send driver state variables */
+{
+	putbinary(&dev->pixaspect, sizeof(dev->pixaspect), 1, devout);
+	putw(dev->xsiz, devout);
+	putw(dev->ysiz, devout);
+	putw(dev->inpready, devout);
 }