glibc/sysdeps/unix/sysv/linux/msgctl.c
Ulrich Drepper a0386a0da3 Update.
2000-09-28  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>

	* sysdeps/unix/sysv/linux/kernel-features.h: Add __ASSUME_IPC64, only
	define it for powerpc for kernel >= 2.4.0.
	* sysdeps/unix/sysv/linux/msgctl.c: Test for __ASSUME_IPC64, not
	__ASSUME_32BITUIDS.
	* sysdeps/unix/sysv/linux/semctl.c: Likewise.
	* sysdeps/unix/sysv/linux/shmctl.c: Likewise.
	* sysdeps/unix/sysv/linux/powerpc/bits/ipc.h: Sync with kernel.
	* sysdeps/unix/sysv/linux/powerpc/bits/msq.h: New file.
	* sysdeps/unix/sysv/linux/powerpc/bits/sem.h: New file.
	* sysdeps/unix/sysv/linux/powerpc/bits/shm.h: New file.

2000-09-28  Martin Schwidefsksy    <schwidefsky@de.ibm.com>

	* sysdeps/s390/atomicity.h: Fix compare_and_swap.
	* sysdeps/unix/sysv/linux/s390/bits/fcntl.h
	(F_GETLK64,F_SETLK64,F_SETLKW64): Use values from 2.4.0-test8.

2000-09-28  Denis Joseph Barrow     <djbarrow@de.ibm.com>

	* sysdeps/unix/sysv/linux/s390/sys/procfs.h: Use definitions from
	ucontext.h.
	* sysdeps/unix/sysv/linux/s390/sys/ucontext.h: Fix ucontext structure.

2000-09-27  Andreas Schwab  <schwab@suse.de>

	* math/Makefile (distribute): Explicitly add the long double test
	sources, to get them included even if long double is not supported.

2000-09-27  Jes Sorensen  <jes@linuxcare.com>

	* elf/soinit.c (struct object): Move definition to gccframe.h and
	include it.  Problem identified by HJ Lu.

	* sysdeps/ia64/gccframe.h: New file.  ia64 specific version of
	struct object to be searched for frame unwind info.
	* sysdeps/generic/gccframe.h: New file.  Generic version of
	struct object to be searched for frame unwind info.

2000-09-28  Ulrich Drepper  <drepper@redhat.com>

	* manual/errno.texi: Correct error text for ENXIO.
	Reported by Jörg Schilling <schilling@fokus.gmd.de>.

2000-09-27  Jes Sorensen  <jes@linuxcare.com>

	* sysdeps/ia64/fpu/fsetexcptflg.c (fesetexceptflag): Set the
	exception status bits rather than the exception disable bits.
	Don't include math.h.

	* sysdeps/ia64/fpu/fgetexcptflg.c (fegetexceptflag): Report the
	status of exceptions currently raised rather than which exceptions
	are enabled.

	* sysdeps/ia64/fpu/fclrexcpt.c (feclearexcept): Typecase to fenv_t
	rather than unsigned long int.

	* sysdeps/ia64/fpu/fedisblxcpt.c (fedisableexcept): Only disable
	the exceptions actually requested by the caller and not just
	disable all exceptions.

	* sysdeps/ia64/fpu/feenablxcpt.c (feenableexcept): Exceptions on
	the ia64 are enabled by clearing the respective bits in the fpsr,
	not setting them.

	* sysdeps/ia64/bits/fenv.h: typedef fexcept_t and fenv_t to
	unsigned long int rather than unsigned long to be consistent with
	the coding conventions.

2000-09-20  H.J. Lu  <hjl@gnu.org>

	* sysdeps/ia64/fpu/fesetenv.c (fesetenv): Use fenv_t instead of
	unsigned long int.
	* sysdeps/ia64/fpu/fesetround.c (fesetround): Likewise.

2000-09-28  Ulrich Drepper  <drepper@redhat.com>

	* string/bits/string2.h: Unify #if usage.

2000-09-27  Jakub Jelinek  <jakub@redhat.com>

	* math/test-fenv.c (feexcp_mask_test): If enabling all exceptions
	and disabling underflow or overflow, disable inexact as well.

	* sysdeps/gnu/netinet/tcp.h: Add tcp_info defines and types.
2000-09-28 23:32:48 +00:00

135 lines
4.4 KiB
C

/* Copyright (C) 1995, 1997, 1998, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with the GNU C Library; see the file COPYING.LIB. If not,
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#include <errno.h>
#include <sys/msg.h>
#include <ipc_priv.h>
#include <sysdep.h>
#include <string.h>
#include <sys/syscall.h>
#include <shlib-compat.h>
#include <bp-checks.h>
#include "kernel-features.h"
struct __old_msqid_ds
{
struct __old_ipc_perm msg_perm; /* structure describing operation permission */
struct msg *__unbounded __msg_first; /* pointer to first message on queue */
struct msg *__unbounded __msg_last; /* pointer to last message on queue */
__time_t msg_stime; /* time of last msgsnd command */
__time_t msg_rtime; /* time of last msgrcv command */
__time_t msg_ctime; /* time of last change */
struct wait_queue *__unbounded __wwait; /* ??? */
struct wait_queue *__unbounded __rwait; /* ??? */
unsigned short int __msg_cbytes; /* current number of bytes on queue */
unsigned short int msg_qnum; /* number of messages currently on queue */
unsigned short int msg_qbytes; /* max number of bytes allowed on queue */
__ipc_pid_t msg_lspid; /* pid of last msgsnd() */
__ipc_pid_t msg_lrpid; /* pid of last msgrcv() */
};
/* Allows to control internal state and destruction of message queue
objects. */
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2)
int __old_msgctl (int, int, struct __old_msqid_ds *);
#endif
int __new_msgctl (int, int, struct msqid_ds *);
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2)
int
__old_msgctl (int msqid, int cmd, struct __old_msqid_ds *buf)
{
return INLINE_SYSCALL (ipc, 5, IPCOP_msgctl, msqid, cmd, 0, CHECK_1 (buf));
}
compat_symbol (libc, __old_msgctl, msgctl, GLIBC_2_0);
#endif
int
__new_msgctl (int msqid, int cmd, struct msqid_ds *buf)
{
#if __ASSUME_IPC64 > 0
return INLINE_SYSCALL (ipc, 5, IPCOP_msgctl,
msqid, cmd | __IPC_64, 0, CHECK_1 (buf));
#else
switch (cmd) {
case MSG_STAT:
case IPC_STAT:
case IPC_SET:
break;
default:
return INLINE_SYSCALL (ipc, 5, IPCOP_msgctl,
msqid, cmd, 0, CHECK_1 (buf));
}
{
int save_errno = errno, result;
struct __old_msqid_ds old;
/* Unfortunately there is no way how to find out for sure whether
we should use old or new msgctl. */
result = INLINE_SYSCALL (ipc, 5, IPCOP_msgctl,
msqid, cmd | __IPC_64, 0, CHECK_1 (buf));
if (result != -1 || errno != EINVAL)
return result;
__set_errno(save_errno);
if (cmd == IPC_SET)
{
old.msg_perm.uid = buf->msg_perm.uid;
old.msg_perm.gid = buf->msg_perm.gid;
old.msg_perm.mode = buf->msg_perm.mode;
old.msg_qbytes = buf->msg_qbytes;
if (old.msg_perm.uid != buf->msg_perm.uid ||
old.msg_perm.gid != buf->msg_perm.gid ||
old.msg_qbytes != buf->msg_qbytes)
{
__set_errno (EINVAL);
return -1;
}
}
result = INLINE_SYSCALL (ipc, 5, IPCOP_msgctl,
msqid, cmd, 0, __ptrvalue (&old));
if (result != -1 && cmd != IPC_SET)
{
memset(buf, 0, sizeof(*buf));
buf->msg_perm.__key = old.msg_perm.__key;
buf->msg_perm.uid = old.msg_perm.uid;
buf->msg_perm.gid = old.msg_perm.gid;
buf->msg_perm.cuid = old.msg_perm.cuid;
buf->msg_perm.cgid = old.msg_perm.cgid;
buf->msg_perm.mode = old.msg_perm.mode;
buf->msg_perm.__seq = old.msg_perm.__seq;
buf->msg_stime = old.msg_stime;
buf->msg_rtime = old.msg_rtime;
buf->msg_ctime = old.msg_ctime;
buf->__msg_cbytes = old.__msg_cbytes;
buf->msg_qnum = old.msg_qnum;
buf->msg_qbytes = old.msg_qbytes;
buf->msg_lspid = old.msg_lspid;
buf->msg_lrpid = old.msg_lrpid;
}
return result;
}
#endif
}
versioned_symbol (libc, __new_msgctl, msgctl, GLIBC_2_2);