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.7 by greg, Fri Jun 18 09:00:22 1993 UTC vs.
Revision 2.16 by greg, Mon Mar 21 19:06:08 2016 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 "platform.h"
21 > #include "standard.h"
22  
16 #define MAXFLEN         8192            /* file must be smaller than this */
23  
24 < extern char     *bmalloc();
24 > #ifndef MAXFLEN
25 > #define MAXFLEN         204800  /* file must be smaller than this */
26 > #endif
27  
28  
29   int
30 < wordfile(words, fname)          /* get words from fname, put in words */
31 < char    **words;
32 < char    *fname;
30 > wordfile(                       /* get words from fname, put in words */
31 >        char    **words,
32 >        int     nargs,
33 >        char    *fname
34 > )
35   {
36          int     fd;
37          char    buf[MAXFLEN];
38 <        register int    n;
38 >        int     n;
39                                          /* load file into buffer */
40          if (fname == NULL)
41                  return(-1);                     /* no filename */
# Line 39 | Line 49 | char   *fname;
49                  while (!isspace(buf[--n]))
50                          if (n <= 0)             /* one long word! */
51                                  return(-1);
52 <        buf[n] = '\0';                  /* terminate */
53 <        return(wordstring(words, buf)); /* wordstring does the rest */
52 >        buf[n] = '\0';                          /* terminate */
53 >        return(wordstring(words, nargs, buf));  /* wordstring does the rest */
54   }
55  
56  
57   int
58 < wordstring(avl, str)                    /* allocate and load argument list */
59 < char    **avl;
60 < char    *str;
58 > wordstring(                             /* allocate and load argument list */
59 >        char    **avl,
60 >        int     nargs,
61 >        char    *str
62 > )
63   {
64 <        register char   *cp, **ap;
64 >        char    *cp, **ap;
65          
66          if (str == NULL)
67                  return(-1);
# Line 57 | Line 69 | char   *str;
69          if (cp == NULL)                 /* ENOMEM */
70                  return(-1);
71          strcpy(cp, str);
72 <        ap = avl;               /* parse into words */
73 <        for ( ; ; ) {
72 >                                        /* parse into words */
73 >        for (ap = avl; ap-avl < nargs-1; ap++) {
74                  while (isspace(*cp))    /* nullify spaces */
75                          *cp++ = '\0';
76                  if (!*cp)               /* all done? */
77                          break;
78 <                *ap++ = cp;             /* add argument to list */
78 >                *ap = cp;               /* add argument to list */
79                  while (*++cp && !isspace(*cp))
80                          ;
81          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines