ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/devcomm.c
(Generate patch)

Comparing ray/src/rt/devcomm.c (file contents):
Revision 2.4 by greg, Thu Nov 18 09:42:58 1993 UTC vs.
Revision 2.10 by greg, Mon Nov 10 16:52:25 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1988 Regents of the University of California */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   *  devcomm.c - communication routines for separate drivers.
6   *
7 < *      10/5/88
7 > *  External symbols declared in driver.h
8   */
9  
10 + #include "copyright.h"
11 +
12 + #include "platform.h"
13 +
14   #include "standard.h"
15  
16 < #include "color.h"
16 > #include "paths.h"
17  
18   #include "driver.h"
19  
19 – #include "vfork.h"
20 –
20   #ifndef DEVPATH
21   #define DEVPATH         getenv("PATH")  /* device search path */
22   #endif
23  
24 < static int      comm_close(), comm_clear(), comm_paintr(),
25 <                comm_getcur(), comm_comout(), comm_comin(), comm_flush();
24 > static int      comm_getcur();
25 > static void     comm_close(), comm_clear(), comm_paintr(),
26 >                comm_comin(), comm_comout(), comm_flush();
27  
28   struct driver   comm_driver = {
29          comm_close, comm_clear, comm_paintr, comm_getcur,
30          comm_comout, comm_comin, comm_flush
31   };
32  
33 < static int      mygets(), myputs(), reply_error(), getstate();
33 > static void     mygets(), myputs(), reply_error(), getstate();
34  
35   FILE    *devin, *devout;
36  
# Line 47 | Line 47 | final_connect()                                /* verify and initialize connection
47                                                  /* get driver parameters */
48          getstate();
49                                                  /* set error vectors */
50 <        cmdvec = comm_comout;
51 <        if (wrnvec != NULL)
52 <                wrnvec = comm_comout;
50 >        erract[COMMAND].pf = comm_comout;
51 >        if (erract[WARNING].pf != NULL)
52 >                erract[WARNING].pf = comm_comout;
53          return(&comm_driver);
54   }
55  
# Line 69 | Line 69 | struct driver *
69   comm_init(dname, id)                    /* set up and execute driver */
70   char    *dname, *id;
71   {
72 <        char    *devname;
72 >        char    *dvcname;
73          int     p1[2], p2[2];
74          char    pin[16], pout[16];
75                                                  /* find driver program */
76 <        if ((devname = getpath(dname, DEVPATH, X_OK)) == NULL) {
77 <                stderr_v(dname);
78 <                stderr_v(": not found\n");
76 >        if ((dvcname = getpath(dname, DEVPATH, X_OK)) == NULL) {
77 >                eputs(dname);
78 >                eputs(": not found\n");
79                  return(NULL);
80          }
81 + #ifdef RHAS_FORK_EXEC
82                                                  /* open communication pipes */
83          if (pipe(p1) == -1 || pipe(p2) == -1)
84                  goto syserr;
# Line 86 | Line 87 | char   *dname, *id;
87                  close(p2[0]);
88                  sprintf(pin, "%d", p1[0]);
89                  sprintf(pout, "%d", p2[1]);
90 <                execl(devname, dname, pin, pout, id, 0);
91 <                perror(devname);
90 >                execl(dvcname, dname, pin, pout, id, 0);
91 >                perror(dvcname);
92                  _exit(127);
93          }
94          if (devchild == -1)
# Line 102 | Line 103 | char   *dname, *id;
103   syserr:
104          perror(dname);
105          return(NULL);
106 +
107 + #else   /* ! RHAS_FORK_EXEC */
108 +
109 +        eputs(dname);
110 +        eputs(": no fork/exec\n");
111 +        return(NULL);
112 +
113 + #endif  /* ! RHAS_FORK_EXEC */
114   }
115  
116  
117 < static
117 > static void
118   comm_close()                    /* done with driver */
119   {
120          int     pid;
121  
122 <        cmdvec = NULL;                          /* reset error vectors */
123 <        if (wrnvec != NULL)
124 <                wrnvec = stderr_v;
122 >        erract[COMMAND].pf = NULL;              /* reset error vectors */
123 >        if (erract[WARNING].pf != NULL)
124 >                erract[WARNING].pf = wputs;
125          fclose(devout);
126          fclose(devin);
127          if (devchild < 0)
# Line 122 | Line 131 | comm_close()                   /* done with driver */
131   }
132  
133  
134 < static
134 > static void
135   comm_clear(xres, yres)                          /* clear screen */
136   int     xres, yres;
137   {
# Line 133 | Line 142 | int    xres, yres;
142   }
143  
144  
145 < static
145 > static void
146   comm_paintr(col, xmin, ymin, xmax, ymax)        /* paint a rectangle */
147   COLOR   col;
148   int     xmin, ymin, xmax, ymax;
# Line 147 | Line 156 | int    xmin, ymin, xmax, ymax;
156   }
157  
158  
159 < static
159 > static void
160   comm_flush()                            /* flush output to driver */
161   {
162          putc(COM_FLUSH, devout);
# Line 175 | Line 184 | int    *xp, *yp;
184   }
185  
186  
187 < static
187 > static void
188   comm_comout(str)                        /* print string to command line */
189   char    *str;
190   {
# Line 186 | Line 195 | char   *str;
195   }
196  
197  
198 < static
198 > static void
199   comm_comin(buf, prompt)                 /* read string from command line */
200   char    *buf;
201   char    *prompt;
# Line 206 | Line 215 | char   *prompt;
215   }
216  
217  
218 < static
218 > static void
219   mygets(s, fp)                           /* get string from file (with nul) */
220   register char   *s;
221   register FILE   *fp;
# Line 220 | Line 229 | register FILE  *fp;
229   }
230  
231  
232 < static
232 > static void
233   myputs(s, fp)                           /* put string to file (with nul) */
234   register char   *s;
235   register FILE   *fp;
# Line 231 | Line 240 | register FILE  *fp;
240   }
241  
242  
243 < static
243 > static void
244   reply_error(routine)                    /* what should we do here? */
245   char    *routine;
246   {
247 <        stderr_v(routine);
248 <        stderr_v(": driver reply error\n");
247 >        eputs(routine);
248 >        eputs(": driver reply error\n");
249          quit(1);
250   }
251  
252  
253 < static
253 > static void
254   getstate()                              /* get driver state variables */
255   {
256          fread((char *)&comm_driver.pixaspect,

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines