--- ray/src/common/getpath.c	1991/11/12 16:55:56	2.1
+++ ray/src/common/getpath.c	1993/08/26 10:14:32	2.8
@@ -1,4 +1,4 @@
-/* Copyright (c) 1991 Regents of the University of California */
+/* Copyright (c) 1992 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -8,12 +8,14 @@ static char SCCSid[] = "$SunId$ LBL";
  *  getpath.c - function to search for file in a list of directories
  */
 
-#define  NULL		0
+#include  "standard.h"
 
-#include  <pwd.h>
+#include  "paths.h"
 
-extern char  *strcpy(), *strcat(), *getenv();
+#ifndef	 NIX
+#include  <pwd.h>
 extern struct passwd  *getpwnam();
+#endif
 
 
 char *
@@ -22,38 +24,45 @@ register char  *fname;
 register char  *searchpath;
 int  mode;
 {
-	static char  pname[256];
+#ifndef	 NIX
 	struct passwd  *pwent;
+#endif
+	static char  pname[MAXPATH];
 	register char  *cp;
 
 	if (fname == NULL)
 		return(NULL);
 
+	pname[0] = '\0';		/* check for full specification */
 	switch (*fname) {
-	case '/':				/* 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 == '/') {		/* 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 != '/');
+		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);
@@ -62,10 +71,10 @@ int  mode;
 							/* check search path */
 	do {
 		cp = pname;
-		while (*searchpath && (*cp = *searchpath++) != ':')
+		while (*searchpath && (*cp = *searchpath++) != PATHSEP)
 			cp++;
-		if (cp > pname && cp[-1] != '/')
-			*cp++ = '/';
+		if (cp > pname && !ISDIRSEP(cp[-1]))
+			*cp++ = DIRSEP;
 		strcpy(cp, fname);
 		if (access(pname, mode) == 0)		/* file accessable? */
 			return(pname);