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.19 by greg, Wed Mar 23 18:17:46 2016 UTC vs.
Revision 2.23 by greg, Fri May 13 16:24:26 2016 UTC

# Line 40 | Line 40 | wordfile(                      /* get words from fname, put in words */
40                  return(-1);                     /* open error */
41          words[0] = NULL;
42          while (nargs > 1 && (n += read(fd, buf+n, MAXWLEN-n)) > 0) {
43 +                int     dlen = n;
44                  int     crem = 0;
45 <                if (n >= MAXWLEN)               /* still something left? */
45 >                if (n > MAXWLEN/2)              /* check for mid-word end */
46                          while (!isspace(buf[--n])) {
47                                  if (n <= 0)     /* one long word! */
48                                          goto done;
# Line 56 | Line 57 | wordfile(                      /* get words from fname, put in words */
57                  words += n; nargs -= n;
58                  wrdcnt += n;
59                  if ((n = crem) > 0)             /* move remainder */
60 <                        memmove(buf, buf+MAXWLEN-crem, crem);
60 >                        memmove(buf, buf+dlen-crem, crem);
61          }
62   done:
63          close(fd);

Diff Legend

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