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

Comparing ray/src/common/fropen.c (file contents):
Revision 2.3 by greg, Tue Jun 16 13:07:45 1992 UTC vs.
Revision 2.8 by greg, Sat Feb 22 02:07:22 2003 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1990 Regents of the University of California */
2
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6
4   /*
5   * Find and open a Radiance library file.
6 + *
7 + *  External symbols declared in standard.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 + */
66 +
67   #include <stdio.h>
68  
69 < #ifndef DEFPATH
14 < #define DEFPATH         ":/usr/local/lib/ray"
15 < #endif
16 < #ifndef ULIBVAR
17 < #define ULIBVAR         "RAYPATH"
18 < #endif
19 < #ifndef DIRSEP
20 < #define DIRSEP          '/'
21 < #endif
22 < #ifndef PATHSEP
23 < #define PATHSEP         ':'
24 < #endif
69 > #include "paths.h"
70  
26 char  *libpath = NULL;          /* library search path */
71  
28
72   FILE *
73 < fropen(fname)                   /* find file and open for reading */
73 > frlibopen(fname)                /* find file and open for reading */
74   register char  *fname;
75   {
76 <        extern char  *strcpy(), *getenv();
76 >        extern char  *strcpy(), *getlibpath();
77          FILE  *fp;
78 <        char  pname[256];
78 >        char  pname[MAXPATH];
79          register char  *sp, *cp;
80  
81          if (fname == NULL)
82                  return(NULL);
83  
84 <        if (fname[0] == DIRSEP || fname[0] == '.')      /* absolute path */
84 >        if (ISDIRSEP(fname[0]) || fname[0] == '.')      /* absolute path */
85                  return(fopen(fname, "r"));
43                
44        if (libpath == NULL) {                  /* get search path */
45                libpath = getenv(ULIBVAR);
46                if (libpath == NULL)
47                        libpath = DEFPATH;
48        }
86                                                  /* check search path */
87 <        sp = libpath;
87 >        sp = getlibpath();
88          do {
89                  cp = pname;
90                  while (*sp && (*cp = *sp++) != PATHSEP)
91                          cp++;
92 <                if (cp > pname && cp[-1] != DIRSEP)
92 >                if (cp > pname && !ISDIRSEP(cp[-1]))
93                          *cp++ = DIRSEP;
94                  strcpy(cp, fname);
95                  if ((fp = fopen(pname, "r")) != NULL)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines