#include <sys/sem.h>
#include <stdarg.h>
+#include <endian.h>
#include "syscall.h"
#include "ipc.h"
-#ifndef IPC_64
-#define IPC_64 0
+#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);
-#ifdef SYS_semctl
- return syscall(SYS_semctl, id, num, cmd | IPC_64, arg);
+ switch (cmd & ~IPC_TIME64) {
+ case SETVAL: case GETALL: case SETALL: case IPC_SET:
+ case IPC_INFO: case SEM_INFO:
+ case IPC_STAT & ~IPC_TIME64:
+ case SEM_STAT & ~IPC_TIME64:
+ case SEM_STAT_ANY & ~IPC_TIME64:
+ 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
+#ifndef SYS_ipc
+ int r = __syscall(SYS_semctl, id, num, IPC_CMD(cmd), arg.buf);
#else
- return syscall(SYS_ipc, IPCOP_semctl, id, num, cmd | IPC_64, &arg);
+ int r = __syscall(SYS_ipc, IPCOP_semctl, id, num, IPC_CMD(cmd), &arg.buf);
+#endif
+#ifdef SYSCALL_IPC_BROKEN_MODE
+ if (r >= 0) switch (cmd | IPC_TIME64) {
+ case IPC_STAT:
+ case SEM_STAT:
+ case SEM_STAT_ANY:
+ arg.buf->sem_perm.mode >>= 16;
+ }
+#endif
+#if IPC_TIME64
+ if (r >= 0 && (cmd&IPC_TIME64)) {
+ IPC_HILO(arg.buf, sem_otime);
+ IPC_HILO(arg.buf, sem_ctime);
+ }
#endif
+ return __syscall_ret(r);
}