ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/fgetword.c
(Generate patch)

Comparing ray/src/common/fgetword.c (file contents):
Revision 2.2 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 2.7 by greg, Sun Apr 9 21:33:24 2017 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines