i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check for valid flags in faccessat() and fchmodat() and implement AT_SYMLINK_NOFOLLOW in fatchownat() using lchown().

Browse Source
This commit is contained in:
John Scipione
2012-03-08 15:20:27 -05:00
parent f2d343d416
commit 6ad9d01a41
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/build/libroot/fs_darwin.cpp
+12 -9
View File
@@ -106,6 +106,12 @@ 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_EACCESS) == 0 && flag != 0) {
// invalid flag
errno = EINVAL;
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)
@@ -183,13 +189,8 @@ fchmodat(int fd, const char* path, mode_t mode, int flag)
int int
fchownat(int fd, const char* path, uid_t owner, gid_t group, int flag) fchownat(int fd, const char* path, uid_t owner, gid_t group, int flag)
{ {
if ((flag & AT_SYMLINK_NOFOLLOW) != 0) { if ((flag & AT_SYMLINK_NOFOLLOW) == 0 && flag != 0) {
// do not dereference, instead return information about the link // invalid flag
// itself
// CURRENTLY UNSUPPORTED
errno = ENOTSUP;
return -1;
} else if (flag != 0) {
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
@@ -202,7 +203,8 @@ fchownat(int fd, const char* path, uid_t owner, gid_t group, int flag)
if (fd == AT_FDCWD || path != NULL && path[0] == '/') { if (fd == AT_FDCWD || path != NULL && path[0] == '/') {
// call chown() ignoring fd // call chown() ignoring fd
return chown(path, owner, group); return (flag & AT_SYMLINK_NOFOLLOW) != 0 ? lchown(path, owner, group)
: (chown(path, owner, group);
} }
char *fullPath = (char *)malloc(MAXPATHLEN); char *fullPath = (char *)malloc(MAXPATHLEN);
@@ -217,7 +219,8 @@ fchownat(int fd, const char* path, uid_t owner, gid_t group, int flag)
return -1; return -1;
} }
int status = chown(fullPath, owner, group); int status = (flag & AT_SYMLINK_NOFOLLOW) != 0
? lchown(fullPath, owner, group) : (chown(fullPath, owner, group);
free(fullPath); free(fullPath);
return status; return status;
} }