ViewVC Help

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

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

Comparing ray/src/common/getpath.c (file contents):
Revision 2.18 by greg, Thu Dec 19 16:38:12 2013 UTC vs.
Revision 2.21 by greg, Sat Dec 28 18:05:14 2019 UTC

#	Line 9 | Line 9 | static const char      RCSid[] = "$Id$";
9
10		#include "copyright.h"
11
12	–	#include  <string.h>
12		#include  <ctype.h>
13
14		#include  "rtio.h"
15		#include  "paths.h"
16
17
18	<	#ifdef _WIN32
18	>	#if defined(_WIN32) || defined(_WIN64)
19		static char *
20		core_getpath    /* wrapped below: expand fname, return full path */
21		#else
#	Line 39 | Line 38 | getpath        /* expand fname, return full path */
38		pname[0] = '\0';                /* check for full specification */
39
40		if (ISABS(fname)) { /* absolute path */
41	<	strncpy(pname, fname, sizeof(pname)-1);
41	>	strlcpy(pname, fname, sizeof(pname));
42		} else {
43		switch (*fname) {
44	<	case '.':                               /* relative to cwd */
45	<	strncpy(pname, fname, sizeof(pname)-1);
44	>	case '.':               /* relative to cwd */
45	>	strlcpy(pname, fname, sizeof(pname));
46		break;
47	<	case '~':                               /* relative to home directory */
47	>	case '~':               /* relative to home directory */
48		fname++;
49		cp = uname;
50	<	for (i=0;i<sizeof(uname)&&*fname!='\0'&&!ISDIRSEP(*fname);i++)
50	>	for (i = 0; i < sizeof(uname) && *fname
51	>	&& !ISDIRSEP(*fname); i++)
52		*cp++ = *fname++;
53		*cp = '\0';
54		cp = gethomedir(uname, pname, sizeof(pname));
55		if(cp == NULL) return NULL;
56	<	strncat(pname, fname, sizeof(pname)-strlen(pname)-1);
56	>	strlcat(pname, fname, sizeof(pname));
57		break;
58		}
59		}
60		if (pname[0])           /* got it, check access if search requested */
61	<	return(searchpath==NULL||access(pname,mode)==0 ? pname : NULL);
61	>	return(!searchpath || access(pname,mode)==0 ? pname : NULL);
62
63	<	if (searchpath == NULL) {                       /* don't search */
64	<	strncpy(pname, fname, sizeof(pname)-1);
63	>	if (!searchpath) {                      /* no search */
64	>	strlcpy(pname, fname, sizeof(pname));
65		return(pname);
66		}
67		/* check search path */
68		do {
69		cp = pname;
70	<	while (*searchpath && (*cp = *searchpath++) != PATHSEP) {
71	<	cp++;
72	<	}
73	<	if (cp > pname && !ISDIRSEP(cp[-1])) {
70	>	while (*searchpath && (*cp = *searchpath++) != PATHSEP)
71	>	cp += (cp-pname < sizeof(pname)-2);
72	>	if (cp > pname && !ISDIRSEP(cp[-1]))
73		*cp++ = DIRSEP;
74	<	}
75	<	strncpy(cp, fname, sizeof(pname)-strlen(pname)-1);
74	>	*cp = '\0';
75	>	strlcat(pname, fname, sizeof(pname));
76		if (access(pname, mode) == 0)           /* file accessable? */
77		return(pname);
78		} while (*searchpath);
#	Line 82 | Line 81 | getpath        /* expand fname, return full path */
81		}
82
83
84	<	#ifdef _WIN32
84	>	#if defined(_WIN32) || defined(_WIN64)
85		/* This is a wrapper around the above, "emulating" access mode X_OK,
86		which is not supported on Windows.
87		If we see X_OK and the filename has no extension, then we'll remove

Diff Legend

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