diff options
author | Karel Zak | 2018-07-03 13:55:32 +0200 |
---|---|---|
committer | Karel Zak | 2018-07-03 13:55:32 +0200 |
commit | 9c836fde5f46bdad86f353bba0696ad7376af320 (patch) | |
tree | 7e78845269d38750cbfc26997b7dc403009a956e /sys-utils | |
parent | fallocate: add man page note about --collapse-range granularity (diff) | |
parent | wipefs: add missing ifdef (diff) | |
download | kernel-qcow2-util-linux-9c836fde5f46bdad86f353bba0696ad7376af320.tar.gz kernel-qcow2-util-linux-9c836fde5f46bdad86f353bba0696ad7376af320.tar.xz kernel-qcow2-util-linux-9c836fde5f46bdad86f353bba0696ad7376af320.zip |
Merge branch 'fixes' of https://github.com/rudimeier/util-linux
* 'fixes' of https://github.com/rudimeier/util-linux:
wipefs: add missing ifdef
lib/path: remove unused expression
ipcs,chmem: fix access() usage
Diffstat (limited to 'sys-utils')
-rw-r--r-- | sys-utils/chmem.c | 2 | ||||
-rw-r--r-- | sys-utils/ipcutils.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys-utils/chmem.c b/sys-utils/chmem.c index e5eab096a..4a4439a22 100644 --- a/sys-utils/chmem.c +++ b/sys-utils/chmem.c @@ -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")); diff --git a/sys-utils/ipcutils.c b/sys-utils/ipcutils.c index e6dd0c561..5fe297fd4 100644 --- a/sys-utils/ipcutils.c +++ b/sys-utils/ipcutils.c @@ -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); |