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

Comparing ray/src/common/wordfile.c (file contents):
Revision 2.5 by greg, Tue Nov 10 18:21:26 1992 UTC vs.
Revision 2.11 by schorsch, Sun Jun 8 12:03:09 2003 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1992 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   * Load whitespace separated words from a file into an array.
6   * Assume the passed pointer array is big enough to hold them all.
7 + *
8 + * External symbols declared in standard.h
9   */
10  
11 + #include "copyright.h"
12 +
13   #include <ctype.h>
14 + #include <string.h>
15 + #include <stdio.h>
16 + #include <sys/types.h>
17 + #include <sys/stat.h>
18 + #include <fcntl.h>
19  
20 < #define NULL            0
20 > #include "standard.h"
21 > #include "platform.h"
22  
23 +
24   #define MAXFLEN         8192            /* file must be smaller than this */
25  
26   extern char     *bmalloc();
# Line 27 | Line 35 | char   *fname;
35          char    buf[MAXFLEN];
36          register int    n;
37                                          /* load file into buffer */
38 +        if (fname == NULL)
39 +                return(-1);                     /* no filename */
40          if ((fd = open(fname, 0)) < 0)
41                  return(-1);                     /* open error */
42          n = read(fd, buf, MAXFLEN);
# Line 62 | Line 72 | char   *str;
72                  if (!*cp)               /* all done? */
73                          break;
74                  *ap++ = cp;             /* add argument to list */
75 <                while (*cp && !isspace(*cp))
76 <                        cp++;
75 >                while (*++cp && !isspace(*cp))
76 >                        ;
77          }
78          *ap = NULL;
79          return(ap - avl);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines