External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 22:25:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: guarantee sane errno in virFileIsExecutable

Browse Source 
If virFileIsExecutable is to replace access(file,X_OK), then
errno must be usable on failure.

* src/util/util.c (virFileIsExecutable): Set errno on failure.
This commit is contained in:
Eric Blake 2011-03-18 14:22:19 -06:00
parent 4179f8e988
commit 8351358fb4
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/util/util.c
View File

@ -1357,7 +1357,8 @@ bool virFileExists(const char *path)
return access(path, F_OK) == 0;
}
/* Check that a file is regular and has executable bits.
/* Check that a file is regular and has executable bits. If false is
* returned, errno is valid.
*
* Note: In the presence of ACLs, this may return true for a file that
* would actually fail with EACCES for a given user, or false for a
@ -1370,9 +1371,12 @@ virFileIsExecutable(const char *file)
/* We would also want to check faccessat if we cared about ACLs,
* but we don't. */
return (stat(file, &sb) == 0 &&
S_ISREG(sb.st_mode) &&
(sb.st_mode & 0111) != 0);
if (stat(file, &sb) < 0)
return false;
if (S_ISREG(sb.st_mode) && (sb.st_mode & 0111) != 0)
return true;
errno = S_ISDIR(sb.st_mode) ? EISDIR : EACCES;
return false;
}
#ifndef WIN32