remove spurious declaration of __getdents from readdir.c

[musl] / src / ipc / semctl.c

diff --git a/src/ipc/semctl.c b/src/ipc/semctl.c
index a210e20..941e281 100644 (file)
--- a/src/ipc/semctl.c
+++ b/src/ipc/semctl.c
@@ -1,18 +1,50 @@
 #include <sys/sem.h>
 #include <stdarg.h>
+#include <endian.h>
 #include "syscall.h"
 #include "ipc.h"
 
+#if __BYTE_ORDER != __BIG_ENDIAN
+#undef SYSCALL_IPC_BROKEN_MODE
+#endif
+
+union semun {
+       int val;
+       struct semid_ds *buf;
+       unsigned short *array;
+};
+
 int semctl(int id, int num, int cmd, ...)
 {
-       long arg;
+       union semun arg = {0};
        va_list ap;
-       va_start(ap, cmd);
-       arg = va_arg(ap, long);
-       va_end(ap);
+       switch (cmd) {
+       case SETVAL: case GETALL: case SETALL: case IPC_STAT: case IPC_SET:
+       case IPC_INFO: case SEM_INFO: case SEM_STAT:
+               va_start(ap, cmd);
+               arg = va_arg(ap, union semun);
+               va_end(ap);
+       }
+#ifdef SYSCALL_IPC_BROKEN_MODE
+       struct semid_ds tmp;
+       if (cmd == IPC_SET) {
+               tmp = *arg.buf;
+               tmp.sem_perm.mode *= 0x10000U;
+               arg.buf = &tmp;
+       }
+#endif
 #ifdef SYS_semctl
-       return syscall(SYS_semctl, id, num, cmd | 0x100, arg);
+       int r = __syscall(SYS_semctl, id, num, cmd | IPC_64, arg.buf);
 #else
-       return syscall(SYS_ipc, IPCOP_semctl, id, num, cmd | 0x100, &arg);
+       int r = __syscall(SYS_ipc, IPCOP_semctl, id, num, cmd | IPC_64, &arg.buf);
+#endif
+#ifdef SYSCALL_IPC_BROKEN_MODE
+       if (r >= 0) switch (cmd) {
+       case IPC_STAT:
+       case SEM_STAT:
+       case SEM_STAT_ANY:
+               arg.buf->sem_perm.mode >>= 16;
+       }
 #endif
+       return __syscall_ret(r);
 }