| 9 |
|
|
| 10 |
|
#include "copyright.h" |
| 11 |
|
|
| 12 |
– |
#include <string.h> |
| 12 |
|
#include <ctype.h> |
| 13 |
|
|
| 14 |
|
#include "rtio.h" |
| 33 |
|
char *cp; |
| 34 |
|
int i; |
| 35 |
|
|
| 36 |
< |
if (fname == NULL) { return(NULL); } |
| 36 |
> |
if (!fname | (fname == pname)) |
| 37 |
> |
return(fname); |
| 38 |
|
|
| 39 |
|
pname[0] = '\0'; /* check for full specification */ |
| 40 |
|
|
| 41 |
< |
if (ISABS(fname)) { /* absolute path */ |
| 42 |
< |
strncpy(pname, fname, sizeof(pname)-1); |
| 41 |
> |
if (ISABS(fname)) { /* absolute path */ |
| 42 |
> |
strlcpy(pname, fname, sizeof(pname)); |
| 43 |
|
} else { |
| 44 |
|
switch (*fname) { |
| 45 |
< |
case '.': /* relative to cwd */ |
| 46 |
< |
strncpy(pname, fname, sizeof(pname)-1); |
| 45 |
> |
case '.': /* relative to cwd */ |
| 46 |
> |
strlcpy(pname, fname, sizeof(pname)); |
| 47 |
|
break; |
| 48 |
< |
case '~': /* relative to home directory */ |
| 48 |
> |
case '~': /* relative to home directory */ |
| 49 |
|
fname++; |
| 50 |
|
cp = uname; |
| 51 |
< |
for (i=0;i<sizeof(uname)&&*fname!='\0'&&!ISDIRSEP(*fname);i++) |
| 51 |
> |
for (i = 0; i < sizeof(uname) && *fname |
| 52 |
> |
&& !ISDIRSEP(*fname); i++) |
| 53 |
|
*cp++ = *fname++; |
| 54 |
|
*cp = '\0'; |
| 55 |
|
cp = gethomedir(uname, pname, sizeof(pname)); |
| 56 |
|
if(cp == NULL) return NULL; |
| 57 |
< |
strncat(pname, fname, sizeof(pname)-strlen(pname)-1); |
| 57 |
> |
strlcat(pname, fname, sizeof(pname)); |
| 58 |
|
break; |
| 59 |
|
} |
| 60 |
|
} |
| 61 |
|
if (pname[0]) /* got it, check access if search requested */ |
| 62 |
< |
return(searchpath==NULL||access(pname,mode)==0 ? pname : NULL); |
| 62 |
> |
return(!searchpath || access(pname,mode)==0 ? pname : NULL); |
| 63 |
|
|
| 64 |
< |
if (searchpath == NULL) { /* don't search */ |
| 65 |
< |
strncpy(pname, fname, sizeof(pname)-1); |
| 64 |
> |
if (!searchpath) { /* no search? */ |
| 65 |
> |
strlcpy(pname, fname, sizeof(pname)); |
| 66 |
|
return(pname); |
| 67 |
|
} |
| 68 |
|
/* check search path */ |
| 69 |
|
do { |
| 70 |
|
cp = pname; |
| 71 |
< |
while (*searchpath && (*cp = *searchpath++) != PATHSEP) { |
| 72 |
< |
cp++; |
| 73 |
< |
} |
| 73 |
< |
if (cp > pname && !ISDIRSEP(cp[-1])) { |
| 71 |
> |
while (*searchpath && (*cp = *searchpath++) != PATHSEP) |
| 72 |
> |
cp += (cp-pname < sizeof(pname)-2); |
| 73 |
> |
if (cp > pname && !ISDIRSEP(cp[-1])) |
| 74 |
|
*cp++ = DIRSEP; |
| 75 |
< |
} |
| 76 |
< |
strncpy(cp, fname, sizeof(pname)-strlen(pname)-1); |
| 75 |
> |
*cp = '\0'; |
| 76 |
> |
strlcat(pname, fname, sizeof(pname)); |
| 77 |
|
if (access(pname, mode) == 0) /* file accessable? */ |
| 78 |
|
return(pname); |
| 79 |
|
} while (*searchpath); |
| 101 |
|
char *cp; |
| 102 |
|
char fname[PATH_MAX]; |
| 103 |
|
|
| 104 |
< |
if (ffname == NULL) |
| 105 |
< |
return(NULL); |
| 104 |
> |
if (!fname | (fname == pname)) |
| 105 |
> |
return(fname); |
| 106 |
|
|
| 107 |
|
/* if we have a dot in the string, we assume there is a file name |
| 108 |
|
extension present */ |
| 109 |
|
/* XXX We'd better test for .exe/.bat/.etc explicitly */ |
| 110 |
< |
if (!(mode & X_OK) || (strrchr(ffname, '.') != NULL)) { |
| 110 |
> |
if (!(mode & X_OK) || strchr(ffname, '.') > ffname) { |
| 111 |
|
return core_getpath(ffname, searchpath, mode); |
| 112 |
|
} |
| 113 |
|
|
