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.20 by greg, Wed Apr 27 17:26:45 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 45 | Line 41 | wordfile(                      /* get words from fname, put in words */
41          words[0] = NULL;
42          while (nargs > 1 && (n += read(fd, buf+n, MAXWLEN-n)) > 0) {
43                  int     crem = 0;
44 <                if (n >= MAXWLEN)               /* still something left? */
44 >                if (n > MAXWLEN/2)              /* check for mid-word end */
45                          while (!isspace(buf[--n])) {
46                                  if (n <= 0)     /* one long word! */
47                                          goto done;
# Line 57 | Line 53 | wordfile(                      /* get words from fname, put in words */
53                          wrdcnt = -1;            /* memory error */
54                          break;
55                  }
56 <                words += n;
61 <                nargs -= n;
56 >                words += n; nargs -= n;
57                  wrdcnt += n;
58                  if ((n = crem) > 0)             /* move remainder */
59 <                        strncpy(buf, buf+MAXWLEN-crem, crem);
59 >                        memmove(buf, buf+MAXWLEN-crem, crem);
60          }
61   done:
62          close(fd);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines