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.14 by greg, Thu May 1 15:50:28 2008 UTC vs.
Revision 2.20 by greg, Thu May 23 22:45:04 2024 UTC

# Line 10 | Line 10 | static const char      RCSid[] = "$Id$";
10   #include "copyright.h"
11  
12   #include <sys/types.h>
13 < #include <sys/wait.h> /* XXX platform specific */
13 > #if !defined(_WIN32) && !defined(_WIN64)
14 > #include <sys/wait.h>
15 > #endif
16  
17 + #include "paths.h"
18   #include "platform.h"
19   #include "standard.h"
20   #include "driver.h"
# Line 25 | Line 28 | int    devchild;
28  
29   static struct driver * final_connect(void);
30   static void mygets(char *s, FILE        *fp);
31 < static void myputs(char *s, FILE        *fp);
31 > static void myputs(const char   *s, FILE        *fp);
32   static void reply_error(char    *routine);
33   static void getstate(void);
34  
# Line 54 | Line 57 | final_connect(void)                            /* verify and initialize connec
57          getstate();
58                                                  /* set error vectors */
59          erract[COMMAND].pf = comm_comout;
60 +        /*                                      doesn't work with raypcalls.c
61          if (erract[WARNING].pf != NULL)
62                  erract[WARNING].pf = comm_comout;
63 +        */
64          return(&comm_driver);
65   }
66  
67  
68 < extern struct driver *
68 > struct driver *
69   slave_init(                     /* run rview in slave mode */
70          char    *dname,
71          char    *id
# Line 73 | Line 78 | slave_init(                    /* run rview in slave mode */
78   }
79  
80  
81 < extern struct driver *
81 > struct driver *
82   comm_init(                      /* set up and execute driver */
83          char    *dname,
84          char    *id
# Line 142 | Line 147 | comm_close(void)                       /* done with driver */
147          fclose(devin);
148          if (devchild < 0)
149                  return;
150 + #if !defined(_WIN32) && !defined(_WIN64)
151          while ((pid = wait(0)) != -1 && pid != devchild)
152                  ;
153 + #endif
154   }
155  
156  
# Line 170 | Line 177 | comm_paintr(   /* paint a rectangle */
177   )
178   {
179          putc(COM_PAINTR, devout);
180 <        fwrite((char *)col, sizeof(COLOR), 1, devout);
180 >        putbinary(col, sizeof(COLOR), 1, devout);
181          putw(xmin, devout);
182          putw(ymin, devout);
183          putw(xmax, devout);
# Line 210 | Line 217 | comm_getcur(                   /* get and return cursor position */
217  
218   static void
219   comm_comout(                    /* print string to command line */
220 <        char    *str
220 >        const char      *str
221   )
222   {
223          putc(COM_COMOUT, devout);
# Line 243 | Line 250 | comm_comin(                    /* read string from command line */
250  
251   static void
252   mygets(                         /* get string from file (with nul) */
253 <        register char   *s,
254 <        register FILE   *fp
253 >        char    *s,
254 >        FILE    *fp
255   )
256   {
257 <        register int    c;
257 >        int     c;
258  
259          while ((c = getc(fp)) != EOF)
260                  if ((*s++ = c) == '\0')
# Line 258 | Line 265 | mygets(                                /* get string from file (with nul) */
265  
266   static void
267   myputs(                         /* put string to file (with nul) */
268 <        register char   *s,
269 <        register FILE   *fp
268 >        const char      *s,
269 >        FILE    *fp
270   )
271   {
272          do
# Line 282 | Line 289 | reply_error(                   /* what should we do here? */
289   static void
290   getstate(void)                          /* get driver state variables */
291   {
292 <        fread((char *)&comm_driver.pixaspect,
292 >        getbinary((char *)&comm_driver.pixaspect,
293                          sizeof(comm_driver.pixaspect), 1, devin);
294          comm_driver.xsiz = getw(devin);
295          comm_driver.ysiz = getw(devin);

Diff Legend

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