From 07e865cc5afb11e6e882e998306ab0f7fb64357e Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Wed, 13 Apr 2011 16:45:43 -0400 Subject: numerous fixes to sysv ipc some of these definitions were just plain wrong, others based on outdated ancient "non-64" versions of the kernel interface. as much as possible has now been moved out of bits/* these changes break abi (the old abi for these functions was wrong), but since they were not working anyway it can hardly matter. --- src/ipc/msgctl.c | 4 ++-- src/ipc/semctl.c | 2 +- src/ipc/shmctl.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/ipc') diff --git a/src/ipc/msgctl.c b/src/ipc/msgctl.c index d50e395b..d1ff7c70 100644 --- a/src/ipc/msgctl.c +++ b/src/ipc/msgctl.c @@ -5,8 +5,8 @@ int msgctl(int q, int cmd, struct msqid_ds *buf) { #ifdef SYS_msgctl - return syscall(SYS_msgctl, q, cmd, buf); + return syscall(SYS_msgctl, q, cmd | 0x100, buf); #else - return syscall(SYS_ipc, IPCOP_msgctl, q, cmd, buf); + return syscall(SYS_ipc, IPCOP_msgctl, q, cmd | 0x100, 0, buf, 0); #endif } diff --git a/src/ipc/semctl.c b/src/ipc/semctl.c index df05ec74..a210e20b 100644 --- a/src/ipc/semctl.c +++ b/src/ipc/semctl.c @@ -11,7 +11,7 @@ int semctl(int id, int num, int cmd, ...) arg = va_arg(ap, long); va_end(ap); #ifdef SYS_semctl - return syscall(SYS_semctl, id, num, cmd, arg); + return syscall(SYS_semctl, id, num, cmd | 0x100, arg); #else return syscall(SYS_ipc, IPCOP_semctl, id, num, cmd | 0x100, &arg); #endif diff --git a/src/ipc/shmctl.c b/src/ipc/shmctl.c index b2bdfa18..ae6ce69e 100644 --- a/src/ipc/shmctl.c +++ b/src/ipc/shmctl.c @@ -5,8 +5,8 @@ int shmctl(int id, int cmd, struct shmid_ds *buf) { #ifdef SYS_shmctl - return syscall(SYS_shmctl, id, cmd, buf); + return syscall(SYS_shmctl, id, cmd | IPC_MODERN, buf); #else - return syscall(SYS_ipc, IPCOP_shmctl, id, cmd | IPC_MODERN, buf); + return syscall(SYS_ipc, IPCOP_shmctl, id, cmd | IPC_MODERN, 0, buf, 0); #endif } -- cgit v1.2.1