X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fipc%2Fshmctl.c;h=1c9f78c2f11f5630142200274b5bb6ad0596e8a0;hb=42aa19a0fefc5c38f6e00734afae80d42ab3bd48;hp=ae6ce69ecd73053f1b1c53ee0b35c73c85addfb0;hpb=07e865cc5afb11e6e882e998306ab0f7fb64357e;p=musl diff --git a/src/ipc/shmctl.c b/src/ipc/shmctl.c index ae6ce69e..1c9f78c2 100644 --- a/src/ipc/shmctl.c +++ b/src/ipc/shmctl.c @@ -1,12 +1,51 @@ #include +#include #include "syscall.h" #include "ipc.h" +#if __BYTE_ORDER != __BIG_ENDIAN +#undef SYSCALL_IPC_BROKEN_MODE +#endif + int shmctl(int id, int cmd, struct shmid_ds *buf) { -#ifdef SYS_shmctl - return syscall(SYS_shmctl, id, cmd | IPC_MODERN, buf); +#if IPC_TIME64 + struct shmid_ds out, *orig; + if (cmd&IPC_TIME64) { + out = (struct shmid_ds){0}; + orig = buf; + buf = &out; + } +#endif +#ifdef SYSCALL_IPC_BROKEN_MODE + struct shmid_ds tmp; + if (cmd == IPC_SET) { + tmp = *buf; + tmp.shm_perm.mode *= 0x10000U; + buf = &tmp; + } +#endif +#ifndef SYS_ipc + int r = __syscall(SYS_shmctl, id, IPC_CMD(cmd), buf); #else - return syscall(SYS_ipc, IPCOP_shmctl, id, cmd | IPC_MODERN, 0, buf, 0); + int r = __syscall(SYS_ipc, IPCOP_shmctl, id, IPC_CMD(cmd), 0, buf, 0); +#endif +#ifdef SYSCALL_IPC_BROKEN_MODE + if (r >= 0) switch (cmd | IPC_TIME64) { + case IPC_STAT: + case SHM_STAT: + case SHM_STAT_ANY: + buf->shm_perm.mode >>= 16; + } +#endif +#if IPC_TIME64 + if (r >= 0 && (cmd&IPC_TIME64)) { + buf = orig; + *buf = out; + IPC_HILO(buf, shm_atime); + IPC_HILO(buf, shm_dtime); + IPC_HILO(buf, shm_ctime); + } #endif + return __syscall_ret(r); }