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

Comparing ray/src/common/getpath.c (file contents):
Revision 2.1 by greg, Tue Nov 12 16:55:56 1991 UTC vs.
Revision 2.9 by greg, Sat Feb 22 02:07:22 2003 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1991 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   *  getpath.c - function to search for file in a list of directories
6 + *
7 + *  External symbols declared in standard.h
8   */
9  
10 < #define  NULL           0
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  <pwd.h>
67 > #include  "standard.h"
68  
69 < extern char  *strcpy(), *strcat(), *getenv();
69 > #include  "paths.h"
70 >
71 > #ifndef  NIX
72 > #include  <pwd.h>
73   extern struct passwd  *getpwnam();
74 + #endif
75  
76  
77   char *
# Line 22 | Line 80 | register char  *fname;
80   register char  *searchpath;
81   int  mode;
82   {
83 <        static char  pname[256];
83 > #ifndef  NIX
84          struct passwd  *pwent;
85 + #endif
86 +        static char  pname[MAXPATH];
87          register char  *cp;
88  
89          if (fname == NULL)
90                  return(NULL);
91  
92 +        pname[0] = '\0';                /* check for full specification */
93          switch (*fname) {
94 <        case '/':                               /* relative to root */
94 >        CASEDIRSEP:                             /* relative to root */
95          case '.':                               /* relative to cwd */
96                  strcpy(pname, fname);
97 <                return(pname);
97 >                break;
98 > #ifndef NIX
99          case '~':                               /* relative to home directory */
100                  fname++;
101 <                if (*fname == '\0' || *fname == '/') {          /* ours */
101 >                if (*fname == '\0' || ISDIRSEP(*fname)) {       /* ours */
102                          if ((cp = getenv("HOME")) == NULL)
103                                  return(NULL);
104                          strcpy(pname, cp);
105                          strcat(pname, fname);
106 <                        return(pname);
106 >                        break;
107                  }
108                  cp = pname;                                     /* user */
109                  do
110                          *cp++ = *fname++;
111 <                while (*fname && *fname != '/');
111 >                while (*fname && !ISDIRSEP(*fname));
112                  *cp = '\0';
113                  if ((pwent = getpwnam(pname)) == NULL)
114                          return(NULL);
115                  strcpy(pname, pwent->pw_dir);
116                  strcat(pname, fname);
117 <                return(pname);
117 >                break;
118 > #endif
119          }
120 +        if (pname[0])           /* got it, check access if search requested */
121 +                return(searchpath==NULL||access(pname,mode)==0 ? pname : NULL);
122  
123          if (searchpath == NULL) {                       /* don't search */
124                  strcpy(pname, fname);
# Line 62 | Line 127 | int  mode;
127                                                          /* check search path */
128          do {
129                  cp = pname;
130 <                while (*searchpath && (*cp = *searchpath++) != ':')
130 >                while (*searchpath && (*cp = *searchpath++) != PATHSEP)
131                          cp++;
132 <                if (cp > pname && cp[-1] != '/')
133 <                        *cp++ = '/';
132 >                if (cp > pname && !ISDIRSEP(cp[-1]))
133 >                        *cp++ = DIRSEP;
134                  strcpy(cp, fname);
135                  if (access(pname, mode) == 0)           /* file accessable? */
136                          return(pname);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines