Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use S_ISDIR instead of S_IFDIR to check if the fd points to a directory and take AT_SYMLINK_NO_FOLLOW out of faccessat because IEEE Std 1003.1-2008 doesn't call for it even though Linux implements it.

Browse Source
This commit is contained in:
John Scipione 2012-03-08 15:01:49 -05:00
parent 981887153d
commit f2d343d416
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/build/libroot/fs_darwin.cpp
View File

@ -30,7 +30,7 @@ get_path(int fd, const char* path, char** fullPath)
return -1; return -1;
} }
if ((dirst.st_mode & S_IFDIR) == 0) { if (!S_ISDIR(dirst.st_mode)) {
// fd does not point to a directory // fd does not point to a directory
errno = ENOTDIR; errno = ENOTDIR;
return -1; return -1;
@ -106,14 +106,6 @@ eaccess(const char* path, int accessMode)
int int
faccessat(int fd, const char* path, int accessMode, int flag) faccessat(int fd, const char* path, int accessMode, int flag)
{ {
if ((flag & AT_SYMLINK_NOFOLLOW) != 0) {
// do not dereference, instead return information about the link
// itself
// CURRENTLY UNSUPPORTED
errno = ENOTSUP;
return -1;
}
if (fd == AT_FDCWD || path != NULL && path[0] == '/') { if (fd == AT_FDCWD || path != NULL && path[0] == '/') {
// call access() ignoring fd // call access() ignoring fd
return (flag & AT_EACCESS) != 0 ? eaccess(path, accessMode) return (flag & AT_EACCESS) != 0 ? eaccess(path, accessMode)