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

Comparing ray/src/common/expandarg.c (file contents):
Revision 2.9 by greg, Sat May 17 02:49:41 2008 UTC vs.
Revision 2.10 by greg, Mon Mar 21 19:06:08 2016 UTC

# Line 24 | Line 24 | int    filexpchr = '@';                /* file expansion character */
24  
25  
26   int
27 < expandarg(acp, avp, n)          /* expand list at argument n */
28 < int     *acp;
29 < register char   ***avp;
30 < int     n;
27 > expandarg(              /* expand list at argument n */
28 >        int     *acp,
29 >        char    ***avp,
30 >        int     n
31 > )
32   {
33          int     ace;
34          char    *ave[MAXARGEXP];
# Line 37 | Line 38 | int    n;
38                  return(0);
39          errno = 0;      
40          if ((*avp)[n][0] == filexpchr) {                /* file name */
41 <                ace = wordfile(ave, (*avp)[n]+1);
41 >                ace = wordfile(ave, MAXARGEXP, (*avp)[n]+1);
42                  if (ace < 0)
43                          return(-1);     /* no such file */
44          } else if ((*avp)[n][0] == envexpchr) {         /* env. variable */
45 <                ace = wordstring(ave, getenv((*avp)[n]+1));
45 >                ace = wordstring(ave, MAXARGEXP, getenv((*avp)[n]+1));
46                  if (ace < 0)
47                          return(-1);     /* no such variable */
48          } else                                          /* regular argument */

Diff Legend

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