ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/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.9 by greg, Tue Feb 25 02:47:22 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  
15   #define NULL            0
# Line 27 | Line 28 | char   *fname;
28          char    buf[MAXFLEN];
29          register int    n;
30                                          /* load file into buffer */
31 +        if (fname == NULL)
32 +                return(-1);                     /* no filename */
33          if ((fd = open(fname, 0)) < 0)
34                  return(-1);                     /* open error */
35          n = read(fd, buf, MAXFLEN);
# Line 62 | Line 65 | char   *str;
65                  if (!*cp)               /* all done? */
66                          break;
67                  *ap++ = cp;             /* add argument to list */
68 <                while (*cp && !isspace(*cp))
69 <                        cp++;
68 >                while (*++cp && !isspace(*cp))
69 >                        ;
70          }
71          *ap = NULL;
72          return(ap - avl);

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)