--- ray/src/common/getpath.c 1992/07/13 16:33:19 2.4
+++ ray/src/common/getpath.c 2003/02/22 02:07:22 2.9
@@ -1,28 +1,77 @@
-/* Copyright (c) 1991 Regents of the University of California */
-
#ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char RCSid[] = "$Id: getpath.c,v 2.9 2003/02/22 02:07:22 greg Exp $";
#endif
-
/*
* getpath.c - function to search for file in a list of directories
+ *
+ * External symbols declared in standard.h
*/
-#define NULL 0
+/* ====================================================================
+ * The Radiance Software License, Version 1.0
+ *
+ * Copyright (c) 1990 - 2002 The Regents of the University of California,
+ * through Lawrence Berkeley National Laboratory. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes Radiance software
+ * (http://radsite.lbl.gov/)
+ * developed by the Lawrence Berkeley National Laboratory
+ * (http://www.lbl.gov/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
+ * and "The Regents of the University of California" must
+ * not be used to endorse or promote products derived from this
+ * software without prior written permission. For written
+ * permission, please contact radiance@radsite.lbl.gov.
+ *
+ * 5. Products derived from this software may not be called "Radiance",
+ * nor may "Radiance" appear in their name, without prior written
+ * permission of Lawrence Berkeley National Laboratory.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of Lawrence Berkeley National Laboratory. For more
+ * information on Lawrence Berkeley National Laboratory, please see
+ * .
+ */
-#ifndef NIX
-#include
-#endif
+#include "standard.h"
-#ifndef DIRSEP
-#define DIRSEP '/'
-#endif
-#ifndef PATHSEP
-#define PATHSEP ':'
-#endif
+#include "paths.h"
-extern char *strcpy(), *strcat(), *getenv();
+#ifndef NIX
+#include
extern struct passwd *getpwnam();
+#endif
char *
@@ -31,42 +80,45 @@ register char *fname;
register char *searchpath;
int mode;
{
-#ifndef NIX
+#ifndef NIX
struct passwd *pwent;
#endif
- static char pname[256];
+ static char pname[MAXPATH];
register char *cp;
if (fname == NULL)
return(NULL);
+ pname[0] = '\0'; /* check for full specification */
switch (*fname) {
- case DIRSEP: /* relative to root */
+ CASEDIRSEP: /* relative to root */
case '.': /* relative to cwd */
strcpy(pname, fname);
- return(pname);
+ break;
#ifndef NIX
case '~': /* relative to home directory */
fname++;
- if (*fname == '\0' || *fname == DIRSEP) { /* ours */
+ if (*fname == '\0' || ISDIRSEP(*fname)) { /* ours */
if ((cp = getenv("HOME")) == NULL)
return(NULL);
strcpy(pname, cp);
strcat(pname, fname);
- return(pname);
+ break;
}
cp = pname; /* user */
do
*cp++ = *fname++;
- while (*fname && *fname != DIRSEP);
+ while (*fname && !ISDIRSEP(*fname));
*cp = '\0';
if ((pwent = getpwnam(pname)) == NULL)
return(NULL);
strcpy(pname, pwent->pw_dir);
strcat(pname, fname);
- return(pname);
+ break;
#endif
}
+ if (pname[0]) /* got it, check access if search requested */
+ return(searchpath==NULL||access(pname,mode)==0 ? pname : NULL);
if (searchpath == NULL) { /* don't search */
strcpy(pname, fname);
@@ -77,7 +129,7 @@ int mode;
cp = pname;
while (*searchpath && (*cp = *searchpath++) != PATHSEP)
cp++;
- if (cp > pname && cp[-1] != DIRSEP)
+ if (cp > pname && !ISDIRSEP(cp[-1]))
*cp++ = DIRSEP;
strcpy(cp, fname);
if (access(pname, mode) == 0) /* file accessable? */