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

Comparing ray/src/util/netproc.c (file contents):
Revision 2.7 by gregl, Thu Oct 16 13:48:49 1997 UTC vs.
Revision 2.11 by schorsch, Mon Jun 30 14:59:13 2003 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1996 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   * Parallel network process handling routines
6   */
7  
8   #include <stdio.h>
12 #include <sys/types.h>
13 #ifdef INCL_SEL_H
14 #include <sys/select.h>
15 #endif
9   #include <signal.h>
10   #include <fcntl.h>
11 + #include <unistd.h>
12 +
13 + #include "selcall.h"
14   #include "netproc.h"
15   #include "paths.h"
16   #include "vfork.h"
21                                        /* select call compatibility stuff */
22 #ifndef FD_SETSIZE
23 #include <sys/param.h>
24 #define FD_SETSIZE      NOFILE          /* maximum # select file descriptors */
25 #endif
26 #ifndef FD_SET
27 #ifndef NFDBITS
28 #define NFDBITS         (8*sizeof(int)) /* number of bits per fd_mask */
29 #endif
30 #define FD_SET(n, p)    ((p)->fds_bits[(n)/NFDBITS] |= (1 << ((n) % NFDBITS)))
31 #define FD_CLR(n, p)    ((p)->fds_bits[(n)/NFDBITS] &= ~(1 << ((n) % NFDBITS)))
32 #define FD_ISSET(n, p)  ((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS)))
33 #ifndef BSD
34 #define bzero(d,n)      (void)memset(d,0,n)
35 #endif
36 #define FD_ZERO(p)      bzero((char *)(p), sizeof(*(p)))
37 #endif
17  
18   PSERVER *pslist = NULL;         /* global process server list */
19  
20   static PROC     *pindex[FD_SETSIZE];    /* process index table */
21  
22   static char     ourhost[64];    /* this host name */
23 < static char     ourdir[MAXPATH];        /* our working directory */
23 > static char     ourdir[PATH_MAX];       /* our working directory */
24   static char     ouruser[32];    /* our user name */
25   static char     *ourshell;      /* our user's shell */
26  
# Line 50 | Line 29 | static int     maxfd;          /* maximum assigned descriptor */
29  
30   extern char     *remsh;         /* externally defined remote shell program */
31  
53 extern char     *malloc(), *realloc();
32   extern char     *getenv();
33  
34  
# Line 67 | Line 45 | int    np;
45          if (ps == NULL)
46                  return(NULL);
47          if (!ourhost[0]) {              /* initialize */
48 <                char    dirtmp[MAXPATH];
48 >                char    dirtmp[PATH_MAX];
49                  register char   *cp;
50                  register int    len;
51  
52                  strcpy(ourhost, myhostname());
53 <                getwd(dirtmp);
53 >                getcwd(dirtmp, sizeof(dirtmp));
54                  if ((cp = getenv("HOME")) != NULL) {
55                          if (!strcmp(cp, dirtmp))
56                                  ourdir[0] = '\0';
# Line 146 | Line 124 | PSERVER        *ps;
124                                          /* remove server from list */
125          psp->next = ps->next;
126          pslist = pstart.next;
127 <        free((char *)ps);               /* free associated memory */
127 >        free((void *)ps);               /* free associated memory */
128   }
129  
130  
# Line 173 | Line 151 | register PSERVER       *ps;
151   char    *command;
152   int     (*compf)();
153   {
154 <        char    udirt[MAXPATH];
154 >        char    udirt[PATH_MAX];
155          char    *av[16];
156          int     pfd[2], pid;
157          register int    i;
# Line 269 | Line 247 | int    fd;
247          if (pp->elen == 0)
248                  pp->errs = (char *)malloc(nr+1);
249          else
250 <                pp->errs = (char *)realloc(pp->errs, pp->elen+nr+1);
250 >                pp->errs = (char *)realloc((void *)pp->errs, pp->elen+nr+1);
251          if (pp->errs == NULL) {
252                  perror("malloc failed");
253                  exit(1);
# Line 316 | Line 294 | int    status;
294          close(pp->efd);                         /* close error stream */
295          pindex[pp->efd] = NULL;
296          FD_CLR(pp->efd, &errdesc);
297 <        free((char *)pp->errs);
297 >        free((void *)pp->errs);
298          pp->com = NULL;                         /* clear settings */
299          pp->pid = -1;
300          pp->efd = -1;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines