6f52fe78fb
- The uid/cuid members of struct ipc_perm are now uid_t instead of unsigned short. - The gid/cgid members of struct ipc_perm are now gid_t instead of unsigned short. - The mode member of struct ipc_perm is now mode_t instead of unsigned short (this is merely a style bug). - The rather dubious padding fields for ABI compat with SV/I386 have been removed from struct msqid_ds and struct semid_ds. - The shm_segsz member of struct shmid_ds is now a size_t instead of an int. This removes the need for the shm_bsegsz member in struct shmid_kernel and should allow for complete support of SYSV SHM regions >= 2GB. - The shm_nattch member of struct shmid_ds is now an int instead of a short. - The shm_internal member of struct shmid_ds is now gone. The internal VM object pointer for SHM regions has been moved into struct shmid_kernel. - The existing __semctl(), msgctl(), and shmctl() system call entries are now marked COMPAT7 and new versions of those system calls which support the new ABI are now present. - The new system calls are assigned to the FBSD-1.1 version in libc. The FBSD-1.0 symbols in libc now refer to the old COMPAT7 system calls. - A simplistic framework for tagging system calls with compatibility symbol versions has been added to libc. Version tags are added to system calls by adding an appropriate __sym_compat() entry to src/lib/libc/incldue/compat.h. [1] PR: kern/16195 kern/113218 bin/129855 Reviewed by: arch@, rwatson Discussed with: kan, kib [1]
84 lines
2.5 KiB
C
84 lines
2.5 KiB
C
/*-
|
|
* Copyright (c) 2002 Doug Rabson
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
*/
|
|
|
|
|
|
#include <sys/cdefs.h>
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
#define _WANT_SEMUN_OLD
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/ipc.h>
|
|
#include <sys/sem.h>
|
|
#include <stdarg.h>
|
|
#include <stdlib.h>
|
|
|
|
int __semctl(int semid, int semnum, int cmd, union semun *arg);
|
|
int freebsd7___semctl(int semid, int semnum, int cmd, union semun_old *arg);
|
|
|
|
int
|
|
semctl(int semid, int semnum, int cmd, ...)
|
|
{
|
|
va_list ap;
|
|
union semun semun;
|
|
union semun *semun_ptr;
|
|
|
|
va_start(ap, cmd);
|
|
if (cmd == IPC_SET || cmd == IPC_STAT || cmd == GETALL
|
|
|| cmd == SETVAL || cmd == SETALL) {
|
|
semun = va_arg(ap, union semun);
|
|
semun_ptr = &semun;
|
|
} else {
|
|
semun_ptr = NULL;
|
|
}
|
|
va_end(ap);
|
|
|
|
return (__semctl(semid, semnum, cmd, semun_ptr));
|
|
}
|
|
|
|
int
|
|
freebsd7_semctl(int semid, int semnum, int cmd, ...)
|
|
{
|
|
va_list ap;
|
|
union semun_old semun;
|
|
union semun_old *semun_ptr;
|
|
|
|
va_start(ap, cmd);
|
|
if (cmd == IPC_SET || cmd == IPC_STAT || cmd == GETALL
|
|
|| cmd == SETVAL || cmd == SETALL) {
|
|
semun = va_arg(ap, union semun_old);
|
|
semun_ptr = &semun;
|
|
} else {
|
|
semun_ptr = NULL;
|
|
}
|
|
va_end(ap);
|
|
|
|
return (freebsd7___semctl(semid, semnum, cmd, semun_ptr));
|
|
}
|
|
|
|
__sym_compat(semctl, freebsd7_semctl, FBSD_1.0);
|