ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/common/fropen.c

Comparing ray/src/common/fropen.c (file contents):
Revision 1.1 by greg, Sat Dec 8 09:28:15 1990 UTC vs.
Revision 2.17 by greg, Sat Jun 7 05:09:45 2025 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 paths.h
8		*/
9
10	+	#include "copyright.h"
11	+
12		#include <stdio.h>
13
14	<	#ifndef DEFPATH
14	<	#define DEFPATH         ":/usr/local/lib/ray"
15	<	#endif
16	<	#ifndef ULIBVAR
17	<	#define ULIBVAR         "RAYPATH"
18	<	#endif
14	>	#include "paths.h"
15
16
17		FILE *
18	<	fropen(fname)                   /* find file and open for reading */
19	<	register char  *fname;
18	>	frlibopen(                      /* find file and open for reading */
19	>	char  *fname
20	>	)
21		{
25	–	extern char  *strcpy(), *getenv();
26	–	static char  *searchpath;
22		FILE  *fp;
23	<	char  pname[256];
24	<	register char  *sp, *cp;
23	>	char  pname[PATH_MAX];
24	>	char  *sp, *cp;
25
26		if (fname == NULL)
27		return(NULL);
28
29	<	if (fname[0] == '/' || fname[0] == '.') /* absolute path */
29	>	if (ISABS(fname) || fname[0] == '.')    /* absolute path */
30		return(fopen(fname, "r"));
36	–
37	–	if (searchpath == NULL) {               /* get search path */
38	–	searchpath = getenv(ULIBVAR);
39	–	if (searchpath == NULL)
40	–	searchpath = DEFPATH;
41	–	}
31		/* check search path */
32	<	sp = searchpath;
32	>	sp = getrlibpath();
33		do {
34		cp = pname;
35	<	while (*sp && (*cp = *sp++) != ':')
35	>	while (*sp && (*cp = *sp++) != PATHSEP)
36		cp++;
37	<	if (cp > pname && cp[-1] != '/')
38	<	*cp++ = '/';
37	>	if (cp > pname && !ISDIRSEP(cp[-1]))
38	>	*cp++ = DIRSEP;
39		strcpy(cp, fname);
40		if ((fp = fopen(pname, "r")) != NULL)
41		return(fp);                     /* got it! */

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)