--- ray/src/rt/devcomm.c	1990/02/28 16:03:57	1.14
+++ ray/src/rt/devcomm.c	1991/11/12 17:09:13	2.1
@@ -20,15 +20,15 @@ static char SCCSid[] = "$SunId$ LBL";
 #define DEVPATH		getenv("PATH")	/* device search path */
 #endif
 
+#ifndef DELAY
+#define DELAY		20		/* seconds to wait for response */
+#endif
+
 #ifndef BSD
 #define vfork		fork
 #endif
 
-extern char	*getpath(), *getenv();
-
-int	onsigio();
-
-int	comm_close(), comm_clear(), comm_paintr(), comm_errout(),
+static int	comm_close(), comm_clear(), comm_paintr(), comm_errout(),
 		comm_getcur(), comm_comout(), comm_comin(), comm_flush();
 
 struct driver	comm_driver = {
@@ -49,7 +49,7 @@ char	*dname, *id;
 	int	p1[2], p2[2];
 	char	pin[16], pout[16];
 						/* find driver program */
-	if ((devname = getpath(dname, DEVPATH, 1)) == NULL) {
+	if ((devname = getpath(dname, DEVPATH, X_OK)) == NULL) {
 		stderr_v(dname);
 		stderr_v(": not found\n");
 		return(NULL);
@@ -74,15 +74,13 @@ char	*dname, *id;
 		goto syserr;
 	if ((devin = fdopen(p2[0], "r")) == NULL)
 		goto syserr;
-						/* verify & get resolution */
+						/* verify initialization */
 	putw(COM_SENDM, devout);
 	fflush(devout);
 	if (getw(devin) != COM_RECVM)
 		return(NULL);
-	fread((char *)&comm_driver.pixaspect,
-			sizeof(comm_driver.pixaspect), 1, devin);
-	comm_driver.xsiz = getw(devin);
-	comm_driver.ysiz = getw(devin);
+						/* get driver parameters */
+	getstate();
 						/* set error vectors */
 	cmdvec = comm_comout;
 	if (wrnvec != NULL)
@@ -141,7 +139,7 @@ comm_flush()				/* flush output to driver */
 	fflush(devout);
 	if (getc(devin) != COM_FLUSH)
 		reply_error("flush");
-	comm_driver.inpready = getw(devin);
+	getstate();
 }
 
 
@@ -168,6 +166,8 @@ char	*str;
 {
 	putc(COM_COMOUT, devout);
 	myputs(str, devout);
+	if (str[strlen(str)-1] == '\n')
+		fflush(devout);
 }
 
 
@@ -187,7 +187,7 @@ char	*prompt;
 	if (getc(devin) != COM_COMIN)
 		reply_error("comin");
 	mygets(buf, devin);
-	comm_driver.inpready = getw(devin);
+	getstate();
 }
 
 
@@ -232,4 +232,15 @@ char	*routine;
 	stderr_v(routine);
 	stderr_v(": driver reply error\n");
 	quit(1);
+}
+
+
+static
+getstate()				/* get driver state variables */
+{
+	fread((char *)&comm_driver.pixaspect,
+			sizeof(comm_driver.pixaspect), 1, devin);
+	comm_driver.xsiz = getw(devin);
+	comm_driver.ysiz = getw(devin);
+	comm_driver.inpready = getw(devin);
 }