ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ipcs,chmem: fix access() usage 

Some mistakes happened lately when switching from path_exist()
to ul_path_access(). See f09a98de and 8ca31279.

This caused ipcs test failures when running i386 binaries on x86_64
hosts, because the syscall fallback was always used. That's why I
reviewed all similar changes and found another one in chmem.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
This commit is contained in:
Ruediger Meier 2018-06-25 14:01:21 +02:00
parent 917f53cf13
commit 77845f7bd7
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys-utils/chmem.c
View File

@ -428,7 +428,7 @@ int main(int argc, char **argv)
/* The valid_zones sysfs attribute was introduced with kernel 3.18 */
if (ul_path_access(desc->sysmem, F_OK, "memory0/valid_zones"))
if (ul_path_access(desc->sysmem, F_OK, "memory0/valid_zones") == 0)
desc->have_zones = 1;
else if (zone)
warnx(_("zone ignored, no valid_zones sysfs attribute present"));

12
sys-utils/ipcutils.c
View File

@ -18,9 +18,9 @@
int ipc_msg_get_limits(struct ipc_limits *lim)
{
if (access(_PATH_PROC_IPC_MSGMNI, F_OK) &&
access(_PATH_PROC_IPC_MSGMNB, F_OK) &&
access(_PATH_PROC_IPC_MSGMAX, F_OK)) {
if (access(_PATH_PROC_IPC_MSGMNI, F_OK) == 0 &&
access(_PATH_PROC_IPC_MSGMNB, F_OK) == 0 &&
access(_PATH_PROC_IPC_MSGMAX, F_OK) == 0) {
ul_path_read_s32(NULL, &lim->msgmni, _PATH_PROC_IPC_MSGMNI);
ul_path_read_s32(NULL, &lim->msgmnb, _PATH_PROC_IPC_MSGMNB);
@ -71,9 +71,9 @@ int ipc_shm_get_limits(struct ipc_limits *lim)
{
lim->shmmin = SHMMIN;
if (access(_PATH_PROC_IPC_SHMALL, F_OK) &&
access(_PATH_PROC_IPC_SHMMAX, F_OK) &&
access(_PATH_PROC_IPC_SHMMNI, F_OK)) {
if (access(_PATH_PROC_IPC_SHMALL, F_OK) == 0 &&
access(_PATH_PROC_IPC_SHMMAX, F_OK) == 0 &&
access(_PATH_PROC_IPC_SHMMNI, F_OK) == 0) {
ul_path_read_u64(NULL, &lim->shmall, _PATH_PROC_IPC_SHMALL);
ul_path_read_u64(NULL, &lim->shmmax, _PATH_PROC_IPC_SHMMAX);