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

Comparing ray/src/common/fropen.c (file contents):
Revision 2.3 by greg, Tue Jun 16 13:07:45 1992 UTC vs.
Revision 2.5 by greg, Tue Sep 8 10:04:29 1992 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1990 Regents of the University of California */
1 > /* Copyright (c) 1992 Regents of the University of California */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ LBL";
# Line 10 | Line 10 | static char SCCSid[] = "$SunId$ LBL";
10  
11   #include <stdio.h>
12  
13 < #ifndef DEFPATH
14 < #define DEFPATH         ":/usr/local/lib/ray"
15 < #endif
16 < #ifndef ULIBVAR
17 < #define ULIBVAR         "RAYPATH"
18 < #endif
19 < #ifndef DIRSEP
20 < #define DIRSEP          '/'
21 < #endif
22 < #ifndef PATHSEP
23 < #define PATHSEP         ':'
24 < #endif
13 > #include "paths.h"
14  
15   char  *libpath = NULL;          /* library search path */
16  
# Line 32 | Line 21 | register char  *fname;
21   {
22          extern char  *strcpy(), *getenv();
23          FILE  *fp;
24 <        char  pname[256];
24 >        char  pname[MAXPATH];
25          register char  *sp, *cp;
26  
27          if (fname == NULL)
28                  return(NULL);
29  
30 <        if (fname[0] == DIRSEP || fname[0] == '.')      /* absolute path */
30 >        if (ISDIRSEP(fname[0]) || fname[0] == '.')      /* absolute path */
31                  return(fopen(fname, "r"));
32                  
33          if (libpath == NULL) {                  /* get search path */
# Line 52 | Line 41 | register char  *fname;
41                  cp = pname;
42                  while (*sp && (*cp = *sp++) != PATHSEP)
43                          cp++;
44 <                if (cp > pname && cp[-1] != DIRSEP)
44 >                if (cp > pname && !ISDIRSEP(cp[-1]))
45                          *cp++ = DIRSEP;
46                  strcpy(cp, fname);
47                  if ((fp = fopen(pname, "r")) != NULL)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines