ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/rt/devcomm.c

Comparing ray/src/rt/devcomm.c (file contents):
Revision 1.17 by greg, Wed Mar 21 09:46:55 1990 UTC vs.
Revision 2.3 by greg, Mon Apr 5 15:16:47 1993 UTC

#	Line 16 | Line 16 | static char SCCSid[] = "$SunId$ LBL";
16
17		#include "driver.h"
18
19	+	#include "vfork.h"
20	+
21		#ifndef DEVPATH
22		#define DEVPATH         getenv("PATH")  /* device search path */
23		#endif
24
25	<	#ifndef DELAY
24	<	#define DELAY           20              /* seconds to wait for response */
25	<	#endif
26	<
27	<	#ifndef BSD
28	<	#define vfork           fork
29	<	#endif
30	<
31	<	extern char     *getpath(), *getenv();
32	<
33	<	static int      comm_close(), comm_clear(), comm_paintr(), comm_errout(),
25	>	static int      comm_close(), comm_clear(), comm_paintr(),
26		comm_getcur(), comm_comout(), comm_comin(), comm_flush();
27
28		struct driver   comm_driver = {
#	Line 43 | Line 35 | FILE   *devin, *devout;
35		int     devchild;
36
37
38	+	static struct driver *
39	+	final_connect()                         /* verify and initialize connection */
40	+	{
41	+	putw(COM_SENDM, devout);
42	+	fflush(devout);
43	+	if (getw(devin) != COM_RECVM)
44	+	return(NULL);
45	+	/* get driver parameters */
46	+	getstate();
47	+	/* set error vectors */
48	+	cmdvec = comm_comout;
49	+	if (wrnvec != NULL)
50	+	wrnvec = comm_comout;
51	+	return(&comm_driver);
52	+	}
53	+
54	+
55		struct driver *
56	+	slave_init(dname, id)                   /* run rview in slave mode */
57	+	char    *dname, *id;
58	+	{
59	+	devchild = -1;                          /* we're the slave here */
60	+	devout = stdout;                        /* use standard input */
61	+	devin = stdin;                          /* and standard output */
62	+	return(final_connect());                /* verify initialization */
63	+	}
64	+
65	+
66	+	struct driver *
67		comm_init(dname, id)                    /* set up and execute driver */
68		char    *dname, *id;
69		{
#	Line 51 | Line 71 | char   *dname, *id;
71		int     p1[2], p2[2];
72		char    pin[16], pout[16];
73		/* find driver program */
74	<	if ((devname = getpath(dname, DEVPATH, 1)) == NULL) {
74	>	if ((devname = getpath(dname, DEVPATH, X_OK)) == NULL) {
75		stderr_v(dname);
76		stderr_v(": not found\n");
77		return(NULL);
#	Line 76 | Line 96 | char   *dname, *id;
96		goto syserr;
97		if ((devin = fdopen(p2[0], "r")) == NULL)
98		goto syserr;
99	<	/* verify initialization */
80	<	putw(COM_SENDM, devout);
81	<	fflush(devout);
82	<	if (getw(devin) != COM_RECVM)
83	<	return(NULL);
84	<	/* get driver parameters */
85	<	getstate();
86	<	/* set error vectors */
87	<	cmdvec = comm_comout;
88	<	if (wrnvec != NULL)
89	<	wrnvec = comm_comout;
90	<	return(&comm_driver);
99	>	return(final_connect());                /* verify initialization */
100		syserr:
101		perror(dname);
102		return(NULL);
#	Line 104 | Line 113 | comm_close()                   /* done with driver */
113		wrnvec = stderr_v;
114		fclose(devout);
115		fclose(devin);
116	+	if (devchild < 0)
117	+	return;
118		while ((pid = wait(0)) != -1 && pid != devchild)
119		;
120		}
#	Line 168 | Line 179 | char   *str;
179		{
180		putc(COM_COMOUT, devout);
181		myputs(str, devout);
182	+	if (str[strlen(str)-1] == '\n')
183	+	fflush(devout);
184		}
185
186
#	Line 188 | Line 201 | char   *prompt;
201		reply_error("comin");
202		mygets(buf, devin);
203		getstate();
191	–	}
192	–
193	–
194	–	static
195	–	comm_errout(str)                        /* display an error message */
196	–	char    *str;
197	–	{
198	–	comm_comout(str);
199	–	stderr_v(str);                  /* send to standard error also */
204		}
205
206

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)