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.17 by greg, Tue Mar 22 15:14:39 2016 UTC vs.
Revision 2.22 by schorsch, Fri May 13 09:12:19 2016 UTC

# Line 3 | Line 3 | static const char      RCSid[] = "$Id$";
3   #endif
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.
6   *
7 < * External symbols declared in standard.h
7 > * External symbols declared in rtio.h
8   */
9  
10   #include "copyright.h"
11  
12   #include <ctype.h>
13   #include <string.h>
15 #include <stdio.h>
16 #include <sys/types.h>
17 #include <sys/stat.h>
18 #include <fcntl.h>
14  
15   #include "platform.h"
16 < #include "standard.h"
16 > #include "rtio.h"
17 > #include "rtmisc.h"
18  
19  
20   #define MAXWLEN         4096    /* words must be shorter than this */
# Line 33 | Line 29 | wordfile(                      /* get words from fname, put in words */
29   {
30          int     wrdcnt = 0;
31          int     n = 0;
32 +        int dlen = 0;
33          int     fd;
34          char    buf[MAXWLEN];
35                                          /* load file into buffer */
# Line 44 | Line 41 | wordfile(                      /* get words from fname, put in words */
41                  return(-1);                     /* open error */
42          words[0] = NULL;
43          while (nargs > 1 && (n += read(fd, buf+n, MAXWLEN-n)) > 0) {
44 +                dlen = n;
45                  int     crem = 0;
46 <                if (n >= MAXWLEN)               /* still something left? */
46 >                if (n > MAXWLEN/2)              /* check for mid-word end */
47                          while (!isspace(buf[--n])) {
48                                  if (n <= 0)     /* one long word! */
49                                          goto done;
# Line 57 | Line 55 | wordfile(                      /* get words from fname, put in words */
55                          wrdcnt = -1;            /* memory error */
56                          break;
57                  }
58 <                words += n;
61 <                nargs -= n;
58 >                words += n; nargs -= n;
59                  wrdcnt += n;
60                  if ((n = crem) > 0)             /* move remainder */
61 <                        strncpy(buf, buf+MAXWLEN-crem, crem);
61 >                        memmove(buf, buf+dlen-crem, crem);
62          }
63   done:
64          close(fd);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines