--- ray/src/common/fropen.c	1990/12/08 09:28:15	1.1
+++ ray/src/common/fropen.c	1994/04/14 04:44:45	2.6
@@ -1,4 +1,4 @@
-/* Copyright (c) 1990 Regents of the University of California */
+/* Copyright (c) 1992 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -10,43 +10,31 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include <stdio.h>
 
-#ifndef	DEFPATH
-#define	DEFPATH		":/usr/local/lib/ray"
-#endif
-#ifndef ULIBVAR
-#define ULIBVAR		"RAYPATH"
-#endif
+#include "paths.h"
 
 
 FILE *
 fropen(fname)			/* find file and open for reading */
 register char  *fname;
 {
-	extern char  *strcpy(), *getenv();
-	static char  *searchpath;
+	extern char  *strcpy(), *getlibpath();
 	FILE  *fp;
-	char  pname[256];
+	char  pname[MAXPATH];
 	register char  *sp, *cp;
 
 	if (fname == NULL)
 		return(NULL);
 
-	if (fname[0] == '/' || fname[0] == '.')	/* absolute path */
+	if (ISDIRSEP(fname[0]) || fname[0] == '.')	/* absolute path */
 		return(fopen(fname, "r"));
-		
-	if (searchpath == NULL) {		/* get search path */
-		searchpath = getenv(ULIBVAR);
-		if (searchpath == NULL)
-			searchpath = DEFPATH;
-	}
 						/* check search path */
-	sp = searchpath;
+	sp = getlibpath();
 	do {
 		cp = pname;
-		while (*sp && (*cp = *sp++) != ':')
+		while (*sp && (*cp = *sp++) != PATHSEP)
 			cp++;
-		if (cp > pname && cp[-1] != '/')
-			*cp++ = '/';
+		if (cp > pname && !ISDIRSEP(cp[-1]))
+			*cp++ = DIRSEP;
 		strcpy(cp, fname);
 		if ((fp = fopen(pname, "r")) != NULL)
 			return(fp);			/* got it! */