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.8 by greg, Sat Feb 22 02:07:23 2003 UTC vs.
Revision 2.16 by greg, Mon Mar 21 19:06:08 2016 UTC

# Line 8 | Line 8 | static const char      RCSid[] = "$Id$";
8   * External symbols declared in standard.h
9   */
10  
11 < /* ====================================================================
12 < * The Radiance Software License, Version 1.0
13 < *
14 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
15 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
16 < *
17 < * Redistribution and use in source and binary forms, with or without
18 < * modification, are permitted provided that the following conditions
19 < * are met:
20 < *
21 < * 1. Redistributions of source code must retain the above copyright
22 < *         notice, this list of conditions and the following disclaimer.
23 < *
24 < * 2. Redistributions in binary form must reproduce the above copyright
25 < *       notice, this list of conditions and the following disclaimer in
26 < *       the documentation and/or other materials provided with the
27 < *       distribution.
28 < *
29 < * 3. The end-user documentation included with the redistribution,
30 < *           if any, must include the following acknowledgment:
31 < *             "This product includes Radiance software
32 < *                 (http://radsite.lbl.gov/)
33 < *                 developed by the Lawrence Berkeley National Laboratory
34 < *               (http://www.lbl.gov/)."
35 < *       Alternately, this acknowledgment may appear in the software itself,
36 < *       if and wherever such third-party acknowledgments normally appear.
37 < *
38 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
39 < *       and "The Regents of the University of California" must
40 < *       not be used to endorse or promote products derived from this
41 < *       software without prior written permission. For written
42 < *       permission, please contact [email protected].
43 < *
44 < * 5. Products derived from this software may not be called "Radiance",
45 < *       nor may "Radiance" appear in their name, without prior written
46 < *       permission of Lawrence Berkeley National Laboratory.
47 < *
48 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
49 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
50 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
51 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
52 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
53 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
54 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
55 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
56 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
57 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
58 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
59 < * SUCH DAMAGE.
60 < * ====================================================================
61 < *
62 < * This software consists of voluntary contributions made by many
63 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
64 < * information on Lawrence Berkeley National Laboratory, please see
65 < * <http://www.lbl.gov/>.
66 < */
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  
72 #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 95 | 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 113 | 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