2000-01-24  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/Dist: Add ipc_priv.h.
	* sysdeps/unix/sysv/linux/alpha/Dist: Likewise.

2000-01-24  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/unix/sysv/linux/bits/ipc.h: Move private decls...
	* sysdeps/unix/sysv/linux/ipc_priv.h: ...here.
	* sysdeps/unix/sysv/linux/bits/msq.h: Move private decls...
	* sysdeps/unix/sysv/linux/msgctl.c: ...here.  Include ipc_priv.h.
	* sysdeps/unix/sysv/linux/bits/sem.h: Move private decls...
	* sysdeps/unix/sysv/linux/semctl.c: ...here.  Include ipc_priv.h.
	* sysdeps/unix/sysv/linux/bits/shm.h: Move private decls...
	* sysdeps/unix/sysv/linux/shmctl.c: ...here.  Include ipc_priv.h.
	* sysdeps/unix/sysv/linux/alpha/bits/ipc.h: Move private decls...
	* sysdeps/unix/sysv/linux/alpha/ipc_priv.h: ...here.
	* sysdeps/unix/sysv/linux/alpha/bits/msq.h: Remove private decls.
	* sysdeps/unix/sysv/linux/alpha/bits/sem.h: Likewise.
	* sysdeps/unix/sysv/linux/alpha/bits/shm.h: Likewise.
	* sysdeps/unix/sysv/linux/sparc/bits/ipc.h: Likewise.
	* sysdeps/unix/sysv/linux/sparc/bits/msq.h: Likewise.
	* sysdeps/unix/sysv/linux/sparc/bits/sem.h: Likewise.
	* sysdeps/unix/sysv/linux/sparc/bits/shm.h: Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc64/msgctl.c: Include ipc_priv.h.
	* sysdeps/unix/sysv/linux/sparc/sparc64/semctl.c: Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc64/shmctl.c: Likewise.
	* sysdeps/unix/sysv/linux/msgget.c: Likewise.
	* sysdeps/unix/sysv/linux/msgrcv.c: Likewise.
	* sysdeps/unix/sysv/linux/msgsnd.c: Likewise.
	* sysdeps/unix/sysv/linux/semget.c: Likewise.
	* sysdeps/unix/sysv/linux/semop.c: Likewise.
	* sysdeps/unix/sysv/linux/shmat.c: Likewise.
	* sysdeps/unix/sysv/linux/shmdt.c: Likewise.
	* sysdeps/unix/sysv/linux/shmget.c: Likewise.
This commit is contained in:
Ulrich Drepper 2000-01-24 12:38:46 +00:00
parent e645ed3a23
commit 973209d8b0
33 changed files with 312 additions and 302 deletions

View File

@ -1,3 +1,39 @@
2000-01-24 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/Dist: Add ipc_priv.h.
* sysdeps/unix/sysv/linux/alpha/Dist: Likewise.
2000-01-24 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/bits/ipc.h: Move private decls...
* sysdeps/unix/sysv/linux/ipc_priv.h: ...here.
* sysdeps/unix/sysv/linux/bits/msq.h: Move private decls...
* sysdeps/unix/sysv/linux/msgctl.c: ...here. Include ipc_priv.h.
* sysdeps/unix/sysv/linux/bits/sem.h: Move private decls...
* sysdeps/unix/sysv/linux/semctl.c: ...here. Include ipc_priv.h.
* sysdeps/unix/sysv/linux/bits/shm.h: Move private decls...
* sysdeps/unix/sysv/linux/shmctl.c: ...here. Include ipc_priv.h.
* sysdeps/unix/sysv/linux/alpha/bits/ipc.h: Move private decls...
* sysdeps/unix/sysv/linux/alpha/ipc_priv.h: ...here.
* sysdeps/unix/sysv/linux/alpha/bits/msq.h: Remove private decls.
* sysdeps/unix/sysv/linux/alpha/bits/sem.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/shm.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/ipc.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/msq.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/sem.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/shm.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/msgctl.c: Include ipc_priv.h.
* sysdeps/unix/sysv/linux/sparc/sparc64/semctl.c: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/shmctl.c: Likewise.
* sysdeps/unix/sysv/linux/msgget.c: Likewise.
* sysdeps/unix/sysv/linux/msgrcv.c: Likewise.
* sysdeps/unix/sysv/linux/msgsnd.c: Likewise.
* sysdeps/unix/sysv/linux/semget.c: Likewise.
* sysdeps/unix/sysv/linux/semop.c: Likewise.
* sysdeps/unix/sysv/linux/shmat.c: Likewise.
* sysdeps/unix/sysv/linux/shmdt.c: Likewise.
* sysdeps/unix/sysv/linux/shmget.c: Likewise.
2000-01-24 Jakub Jelinek <jakub@redhat.com> 2000-01-24 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/arm/bits/resource.h: New file. * sysdeps/unix/sysv/linux/arm/bits/resource.h: New file.

View File

@ -1,5 +1,8 @@
2000-01-24 Ulrich Drepper <drepper@cygnus.com> 2000-01-24 Ulrich Drepper <drepper@cygnus.com>
* locales/gl_ES: New file.
Contributed by Jacobo Tarrio <jtarrio@ceu.fi.udc.es>.
* locales/POSIX: Remove trailing semicolon. * locales/POSIX: Remove trailing semicolon.
* locales/th_TH: Likewise. * locales/th_TH: Likewise.
PR libc/1545. PR libc/1545.

96
localedata/locales/gl_ES Normal file
View File

@ -0,0 +1,96 @@
comment_char %
escape_char /
repertoiremap mnemonic.ds
%
% Galician Language Locale for Spain
% Source: GPUL
% Address: Facultade de Informática
% Campus de Elvin~a, s/n
% 15071 A Corun~a, Spain
% Contact: Jacobo Tarrio
% Email: gpul@ceu.fi.udc.es
% Language: gl
% Territory: ES
% Revision: 1.0
% Date: 1999-07-07
% Application: general
% Users: general
% Repertoiremap: mnemonic.ds
% Charset: ISO-8859-1
% Distribution and use is free, also
% for commercial purposes.
% Based in the es_ES Locale
LC_COLLATE
copy "es_ES"
END LC_COLLATE
LC_CTYPE
copy "en_DK"
END LC_CTYPE
LC_MESSAGES
yesexpr "<'/>><<(><s><S><y><Y><)/>><.><*>"
noexpr "<'/>><<(><n><N><)/>><.><*>"
END LC_MESSAGES
LC_MONETARY
int_curr_symbol "<E><S><P><SP>"
currency_symbol "<P><t><a>"
mon_decimal_point "<,>"
mon_thousands_sep "<.>"
mon_grouping 3;3
positive_sign ""
negative_sign "<->"
int_frac_digits 0
frac_digits 0
p_cs_precedes 1
p_sep_by_space 1
n_cs_precedes 1
n_sep_by_space 1
p_sign_posn 1
n_sign_posn 1
END LC_MONETARY
LC_NUMERIC
decimal_point "<,>"
thousands_sep ""
grouping 0;0
END LC_NUMERIC
LC_TIME
abday "<D><o><m>";"<L><u><n>";/
"<M><a><r>";"<M><e'><r>";/
"<X><o><v>";"<V><e><n>";/
"<S><a'><b>"
day "<D><o><m><i><n><g><o>";/
"<L><u><n><s>";/
"<M><a><r><t><e><s>";/
"<M><e'><r><c><o><r><e><s>";/
"<X><o><v><e><s>";/
"<V><e><n><r><e><s>";/
"<S><a'><b><a><d><o>"
abmon "<X><a><n>";"<F><e><b>";/
"<M><a><r>";"<A><b><r>";/
"<M><a><i>";"<X><u><n?>";/
"<X><u><l>";"<A><g><o>";/
"<S><e><t>";"<O><u><t>";/
"<N><o><v>";"<D><e><c>"
mon "<X><a><n><e><i><r><o>";/
"<F><e><b><r><e><i><r><o>";/
"<M><a><r><z><o>";/
"<A><b><r><i><l>";/
"<M><a><i><o>";/
"<X><u><n?><o>";/
"<X><u><l><l><o>";/
"<A><g><o><s><t><o>";/
"<S><e><t><e><m><b><r><o>";/
"<O><u><t><u><b><r><o>";/
"<N><o><v><e><m><b><r><o>";/
"<D><e><c><e><m><b><r><o>"
d_t_fmt "<%><a><SP><%><d><SP><%><b><SP><%><Y><SP><%><T><SP><%><Z>"
d_fmt "<%><d><//><%><m><//><%><y>"
t_fmt "<%><T>"
am_pm "";""
t_fmt_ampm ""
END LC_TIME

View File

@ -4,6 +4,7 @@ errlist.h
getdirentries.c getdirentries.c
getdirentries64.c getdirentries64.c
init-first.h init-first.h
ipc_priv.h
kernel-features.h kernel-features.h
kernel_sigaction.h kernel_sigaction.h
kernel_stat.h kernel_stat.h

View File

@ -5,6 +5,7 @@ ieee_get_fp_control.S
ieee_set_fp_control.S ieee_set_fp_control.S
init-first.h init-first.h
ioperm.c ioperm.c
ipc_priv.h
kernel_sigaction.h kernel_sigaction.h
kernel_stat.h kernel_stat.h
kernel_termios.h kernel_termios.h

View File

@ -51,39 +51,3 @@ struct ipc_perm
unsigned long int __unused1; unsigned long int __unused1;
unsigned long int __unused2; unsigned long int __unused2;
}; };
#ifdef __LIBC_IPC_INTERNAL
struct __old_ipc_perm
{
__key_t __key; /* Key. */
unsigned int uid; /* Owner's user ID. */
unsigned int gid; /* Owner's group ID. */
unsigned int cuid; /* Creator's user ID. */
unsigned int cgid; /* Creator's group ID. */
unsigned int mode; /* Read/write permission. */
unsigned short int __seq; /* Sequence number. */
};
__BEGIN_DECLS
/* The actual system call: all functions are multiplexed by this. */
extern int __ipc (int __call, int __first, int __second, int __third,
void *__ptr);
__END_DECLS
/* The codes for the functions to use the multiplexer `__ipc'. */
#define IPCOP_semop 1
#define IPCOP_semget 2
#define IPCOP_semctl 3
#define IPCOP_msgsnd 11
#define IPCOP_msgrcv 12
#define IPCOP_msgget 13
#define IPCOP_msgctl 14
#define IPCOP_shmat 21
#define IPCOP_shmdt 22
#define IPCOP_shmget 23
#define IPCOP_shmctl 24
#endif

View File

@ -44,25 +44,6 @@ struct msqid_ds
unsigned long int __unused2; unsigned long int __unused2;
}; };
#ifdef __LIBC_IPC_INTERNAL
struct __old_msqid_ds
{
struct __old_ipc_perm msg_perm; /* structure describing operation permission */
struct msg *__msg_first; /* pointer to first message on queue */
struct msg *__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 *__wwait; /* ??? */
struct wait_queue *__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() */
};
#endif
#ifdef __USE_MISC #ifdef __USE_MISC
# define msg_cbytes __msg_cbytes # define msg_cbytes __msg_cbytes

View File

@ -46,20 +46,6 @@ struct semid_ds
unsigned long int __unused2; unsigned long int __unused2;
}; };
#ifdef __LIBC_IPC_INTERNAL
struct __old_semid_ds
{
struct __old_ipc_perm sem_perm; /* operation permission struct */
__time_t sem_otime; /* last semop() time */
__time_t sem_ctime; /* last time changed by semctl() */
struct sem *__sembase; /* ptr to first semaphore in array */
struct sem_queue *__sem_pending; /* pending operations */
struct sem_queue *__sem_pending_last; /* last pending operation */
struct sem_undo *__undo; /* ondo requests on this array */
unsigned short int sem_nsems; /* number of semaphores in set */
};
#endif
/* The user should define a union like the following to use it for arguments /* The user should define a union like the following to use it for arguments
for `semctl'. for `semctl'.

View File

@ -51,23 +51,6 @@ struct shmid_ds
unsigned long int __unused2; unsigned long int __unused2;
}; };
#ifdef __LIBC_IPC_INTERNAL
struct __old_shmid_ds
{
struct __old_ipc_perm shm_perm; /* operation permission struct */
int shm_segsz; /* size of segment in bytes */
__time_t shm_atime; /* time of last shmat() */
__time_t shm_dtime; /* time of last shmdt() */
__time_t shm_ctime; /* time of last change by shmctl() */
__ipc_pid_t shm_cpid; /* pid of creator */
__ipc_pid_t shm_lpid; /* pid of last shmop */
unsigned short int shm_nattch; /* number of current attaches */
unsigned short int __shm_npages; /* size of segment (pages) */
unsigned long int *__shm_pages; /* array of ptrs to frames -> SHMMAX */
struct vm_area_struct *__attaches; /* descriptors for attaches */
};
#endif
#ifdef __USE_MISC #ifdef __USE_MISC
/* ipcs ctl commands */ /* ipcs ctl commands */
@ -91,15 +74,6 @@ struct shminfo
unsigned long int __unused4; unsigned long int __unused4;
}; };
struct __old_shminfo
{
int shmmax;
int shmmin;
int shmmni;
int shmseg;
int shmall;
};
struct shm_info struct shm_info
{ {
int used_ids; int used_ids;

View File

@ -0,0 +1,54 @@
/* Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
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 <sys/ipc.h>
#define __IPC_64 0x100
struct __old_ipc_perm
{
__key_t __key; /* Key. */
unsigned int uid; /* Owner's user ID. */
unsigned int gid; /* Owner's group ID. */
unsigned int cuid; /* Creator's user ID. */
unsigned int cgid; /* Creator's group ID. */
unsigned int mode; /* Read/write permission. */
unsigned short int __seq; /* Sequence number. */
};
__BEGIN_DECLS
/* The actual system call: all functions are multiplexed by this. */
extern int __syscall_ipc (int __call, int __first, int __second,
int __third, void *__ptr);
__END_DECLS
/* The codes for the functions to use the multiplexer `__syscall_ipc'. */
#define IPCOP_semop 1
#define IPCOP_semget 2
#define IPCOP_semctl 3
#define IPCOP_msgsnd 11
#define IPCOP_msgrcv 12
#define IPCOP_msgget 13
#define IPCOP_msgctl 14
#define IPCOP_shmat 21
#define IPCOP_shmdt 22
#define IPCOP_shmget 23
#define IPCOP_shmctl 24

View File

@ -36,8 +36,6 @@
/* Special key values. */ /* Special key values. */
#define IPC_PRIVATE ((__key_t) 0) /* Private key. */ #define IPC_PRIVATE ((__key_t) 0) /* Private key. */
#define __IPC_64 0x100
/* Data structure used to pass permission information to IPC operations. */ /* Data structure used to pass permission information to IPC operations. */
struct ipc_perm struct ipc_perm
@ -54,39 +52,3 @@ struct ipc_perm
unsigned long int __unused1; unsigned long int __unused1;
unsigned long int __unused2; unsigned long int __unused2;
}; };
#ifdef __LIBC_IPC_INTERNAL
struct __old_ipc_perm
{
__key_t __key; /* Key. */
unsigned short int uid; /* Owner's user ID. */
unsigned short int gid; /* Owner's group ID. */
unsigned short int cuid; /* Creator's user ID. */
unsigned short int cgid; /* Creator's group ID. */
unsigned short int mode; /* Read/write permission. */
unsigned short int __seq; /* Sequence number. */
};
__BEGIN_DECLS
/* The actual system call: all functions are multiplexed by this. */
extern int __syscall_ipc (int __call, int __first, int __second,
int __third, void *__ptr);
__END_DECLS
/* The codes for the functions to use the multiplexer `__syscall_ipc'. */
#define IPCOP_semop 1
#define IPCOP_semget 2
#define IPCOP_semctl 3
#define IPCOP_msgsnd 11
#define IPCOP_msgrcv 12
#define IPCOP_msgget 13
#define IPCOP_msgctl 14
#define IPCOP_shmat 21
#define IPCOP_shmdt 22
#define IPCOP_shmget 23
#define IPCOP_shmctl 24
#endif /* __LIBC_IPC_INTERNAL */

View File

@ -47,25 +47,6 @@ struct msqid_ds
unsigned long int __unused5; unsigned long int __unused5;
}; };
#ifdef __LIBC_IPC_INTERNAL
struct __old_msqid_ds
{
struct __old_ipc_perm msg_perm; /* structure describing operation permission */
struct msg *__msg_first; /* pointer to first message on queue */
struct msg *__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 *__wwait; /* ??? */
struct wait_queue *__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() */
};
#endif
#ifdef __USE_MISC #ifdef __USE_MISC
# define msg_cbytes __msg_cbytes # define msg_cbytes __msg_cbytes

View File

@ -48,20 +48,6 @@ struct semid_ds
unsigned long int __unused4; unsigned long int __unused4;
}; };
#ifdef __LIBC_IPC_INTERNAL
struct __old_semid_ds
{
struct __old_ipc_perm sem_perm; /* operation permission struct */
__time_t sem_otime; /* last semop() time */
__time_t sem_ctime; /* last time changed by semctl() */
struct sem *__sembase; /* ptr to first semaphore in array */
struct sem_queue *__sem_pending; /* pending operations */
struct sem_queue *__sem_pending_last; /* last pending operation */
struct sem_undo *__undo; /* ondo requests on this array */
unsigned short int sem_nsems; /* number of semaphores in set */
};
#endif
/* The user should define a union like the following to use it for arguments /* The user should define a union like the following to use it for arguments
for `semctl'. for `semctl'.

View File

@ -54,23 +54,6 @@ struct shmid_ds
unsigned long int __unused5; unsigned long int __unused5;
}; };
#ifdef __LIBC_IPC_INTERNAL
struct __old_shmid_ds
{
struct __old_ipc_perm shm_perm; /* operation permission struct */
int shm_segsz; /* size of segment in bytes */
__time_t shm_atime; /* time of last shmat() */
__time_t shm_dtime; /* time of last shmdt() */
__time_t shm_ctime; /* time of last change by shmctl() */
__ipc_pid_t shm_cpid; /* pid of creator */
__ipc_pid_t shm_lpid; /* pid of last shmop */
unsigned short int shm_nattch; /* number of current attaches */
unsigned short int __shm_npages; /* size of segment (pages) */
unsigned long int *__shm_pages; /* array of ptrs to frames -> SHMMAX */
struct vm_area_struct *__attaches; /* descriptors for attaches */
};
#endif
#ifdef __USE_MISC #ifdef __USE_MISC
/* ipcs ctl commands */ /* ipcs ctl commands */
@ -94,15 +77,6 @@ struct shminfo
unsigned long int __unused4; unsigned long int __unused4;
}; };
struct __old_shminfo
{
int shmmax;
int shmmin;
int shmmni;
int shmseg;
int shmall;
};
struct shm_info struct shm_info
{ {
int used_ids; int used_ids;

View File

@ -0,0 +1,54 @@
/* Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
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 <sys/ipc.h>
#define __IPC_64 0x100
struct __old_ipc_perm
{
__key_t __key; /* Key. */
unsigned short int uid; /* Owner's user ID. */
unsigned short int gid; /* Owner's group ID. */
unsigned short int cuid; /* Creator's user ID. */
unsigned short int cgid; /* Creator's group ID. */
unsigned short int mode; /* Read/write permission. */
unsigned short int __seq; /* Sequence number. */
};
__BEGIN_DECLS
/* The actual system call: all functions are multiplexed by this. */
extern int __syscall_ipc (int __call, int __first, int __second,
int __third, void *__ptr);
__END_DECLS
/* The codes for the functions to use the multiplexer `__syscall_ipc'. */
#define IPCOP_semop 1
#define IPCOP_semget 2
#define IPCOP_semctl 3
#define IPCOP_msgsnd 11
#define IPCOP_msgrcv 12
#define IPCOP_msgget 13
#define IPCOP_msgctl 14
#define IPCOP_shmat 21
#define IPCOP_shmdt 22
#define IPCOP_shmget 23
#define IPCOP_shmctl 24

View File

@ -17,9 +17,9 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#define __LIBC_IPC_INTERNAL
#include <errno.h> #include <errno.h>
#include <sys/msg.h> #include <sys/msg.h>
#include <ipc_priv.h>
#include <sysdep.h> #include <sysdep.h>
#include <string.h> #include <string.h>
@ -27,6 +27,23 @@
#include "kernel-features.h" #include "kernel-features.h"
struct __old_msqid_ds
{
struct __old_ipc_perm msg_perm; /* structure describing operation permission */
struct msg *__msg_first; /* pointer to first message on queue */
struct msg *__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 *__wwait; /* ??? */
struct wait_queue *__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 /* Allows to control internal state and destruction of message queue
objects. */ objects. */
int __old_msgctl (int, int, struct __old_msqid_ds *); int __old_msgctl (int, int, struct __old_msqid_ds *);

View File

@ -17,9 +17,9 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#define __LIBC_IPC_INTERNAL
#include <errno.h> #include <errno.h>
#include <sys/msg.h> #include <sys/msg.h>
#include <ipc_priv.h>
#include <stdlib.h> /* for definition of NULL */ #include <stdlib.h> /* for definition of NULL */
#include <sysdep.h> #include <sysdep.h>

View File

@ -17,9 +17,9 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#define __LIBC_IPC_INTERNAL
#include <errno.h> #include <errno.h>
#include <sys/msg.h> #include <sys/msg.h>
#include <ipc_priv.h>
#include <sysdep.h> #include <sysdep.h>
#include <sys/syscall.h> #include <sys/syscall.h>

View File

@ -17,9 +17,9 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#define __LIBC_IPC_INTERNAL
#include <errno.h> #include <errno.h>
#include <sys/msg.h> #include <sys/msg.h>
#include <ipc_priv.h>
#include <sysdep.h> #include <sysdep.h>
#include <sys/syscall.h> #include <sys/syscall.h>

View File

@ -17,10 +17,10 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#define __LIBC_IPC_INTERNAL
#include <errno.h> #include <errno.h>
#include <stdarg.h> #include <stdarg.h>
#include <sys/sem.h> #include <sys/sem.h>
#include <ipc_priv.h>
#include <sysdep.h> #include <sysdep.h>
#include <string.h> #include <string.h>
@ -28,6 +28,18 @@
#include "kernel-features.h" #include "kernel-features.h"
struct __old_semid_ds
{
struct __old_ipc_perm sem_perm; /* operation permission struct */
__time_t sem_otime; /* last semop() time */
__time_t sem_ctime; /* last time changed by semctl() */
struct sem *__sembase; /* ptr to first semaphore in array */
struct sem_queue *__sem_pending; /* pending operations */
struct sem_queue *__sem_pending_last; /* last pending operation */
struct sem_undo *__undo; /* ondo requests on this array */
unsigned short int sem_nsems; /* number of semaphores in set */
};
/* Define a `union semun' suitable for Linux here. */ /* Define a `union semun' suitable for Linux here. */
union semun union semun
{ {

View File

@ -17,9 +17,9 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#define __LIBC_IPC_INTERNAL
#include <errno.h> #include <errno.h>
#include <sys/sem.h> #include <sys/sem.h>
#include <ipc_priv.h>
#include <stdlib.h> /* for definition of NULL */ #include <stdlib.h> /* for definition of NULL */
#include <sysdep.h> #include <sysdep.h>

View File

@ -17,9 +17,9 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#define __LIBC_IPC_INTERNAL
#include <errno.h> #include <errno.h>
#include <sys/sem.h> #include <sys/sem.h>
#include <ipc_priv.h>
#include <sysdep.h> #include <sysdep.h>
#include <sys/syscall.h> #include <sys/syscall.h>

View File

@ -17,9 +17,9 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#define __LIBC_IPC_INTERNAL
#include <errno.h> #include <errno.h>
#include <sys/shm.h> #include <sys/shm.h>
#include <ipc_priv.h>
#include <sysdep.h> #include <sysdep.h>
#include <sys/syscall.h> #include <sys/syscall.h>

View File

@ -17,9 +17,9 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#define __LIBC_IPC_INTERNAL
#include <errno.h> #include <errno.h>
#include <sys/shm.h> #include <sys/shm.h>
#include <ipc_priv.h>
#include <sysdep.h> #include <sysdep.h>
#include <string.h> #include <string.h>
@ -28,6 +28,30 @@
#include "kernel-features.h" #include "kernel-features.h"
struct __old_shmid_ds
{
struct __old_ipc_perm shm_perm; /* operation permission struct */
int shm_segsz; /* size of segment in bytes */
__time_t shm_atime; /* time of last shmat() */
__time_t shm_dtime; /* time of last shmdt() */
__time_t shm_ctime; /* time of last change by shmctl() */
__ipc_pid_t shm_cpid; /* pid of creator */
__ipc_pid_t shm_lpid; /* pid of last shmop */
unsigned short int shm_nattch; /* number of current attaches */
unsigned short int __shm_npages; /* size of segment (pages) */
unsigned long int *__shm_pages; /* array of ptrs to frames -> SHMMAX */
struct vm_area_struct *__attaches; /* descriptors for attaches */
};
struct __old_shminfo
{
int shmmax;
int shmmin;
int shmmni;
int shmseg;
int shmall;
};
/* Provide operations to control over shared memory segments. */ /* Provide operations to control over shared memory segments. */
int __old_shmctl (int, int, struct __old_shmid_ds *); int __old_shmctl (int, int, struct __old_shmid_ds *);
int __new_shmctl (int, int, struct shmid_ds *); int __new_shmctl (int, int, struct shmid_ds *);

View File

@ -17,9 +17,9 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#define __LIBC_IPC_INTERNAL
#include <errno.h> #include <errno.h>
#include <sys/shm.h> #include <sys/shm.h>
#include <ipc_priv.h>
#include <sysdep.h> #include <sysdep.h>
#include <sys/syscall.h> #include <sys/syscall.h>

View File

@ -17,9 +17,9 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#define __LIBC_IPC_INTERNAL
#include <errno.h> #include <errno.h>
#include <sys/shm.h> #include <sys/shm.h>
#include <ipc_priv.h>
#include <stdlib.h> /* for definition of NULL */ #include <stdlib.h> /* for definition of NULL */
#include <sysdep.h> #include <sysdep.h>

View File

@ -37,8 +37,6 @@
/* Special key values. */ /* Special key values. */
#define IPC_PRIVATE ((__key_t) 0) /* Private key. */ #define IPC_PRIVATE ((__key_t) 0) /* Private key. */
#define __IPC_64 0x100
/* Data structure used to pass permission information to IPC operations. */ /* Data structure used to pass permission information to IPC operations. */
struct ipc_perm struct ipc_perm
@ -60,39 +58,3 @@ struct ipc_perm
unsigned long long int __unused1; unsigned long long int __unused1;
unsigned long long int __unused2; unsigned long long int __unused2;
}; };
#ifdef __LIBC_IPC_INTERNAL
struct __old_ipc_perm
{
__key_t __key; /* Key. */
unsigned short int uid; /* Owner's user ID. */
unsigned short int gid; /* Owner's group ID. */
unsigned short int cuid; /* Creator's user ID. */
unsigned short int cgid; /* Creator's group ID. */
unsigned short int mode; /* Read/write permission. */
unsigned short int __seq; /* Sequence number. */
};
__BEGIN_DECLS
/* The actual system call: all functions are multiplexed by this. */
extern int __syscall_ipc (int __call, int __first, int __second,
int __third, void *__ptr);
__END_DECLS
/* The codes for the functions to use the multiplexer `__syscall_ipc'. */
#define IPCOP_semop 1
#define IPCOP_semget 2
#define IPCOP_semctl 3
#define IPCOP_msgsnd 11
#define IPCOP_msgrcv 12
#define IPCOP_msgget 13
#define IPCOP_msgctl 14
#define IPCOP_shmat 21
#define IPCOP_shmdt 22
#define IPCOP_shmget 23
#define IPCOP_shmctl 24
#endif /* __LIBC_IPC_INTERNAL */

View File

@ -54,27 +54,6 @@ struct msqid_ds
unsigned long int __unused2; unsigned long int __unused2;
}; };
#ifdef __LIBC_IPC_INTERNAL
struct __old_msqid_ds
{
struct __old_ipc_perm msg_perm; /* structure describing operation permission */
struct msg *__msg_first; /* pointer to first message on queue */
struct msg *__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 *__wwait; /* ??? */
struct wait_queue *__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() */
};
#endif
#ifdef __USE_MISC #ifdef __USE_MISC
# define msg_cbytes __msg_cbytes # define msg_cbytes __msg_cbytes

View File

@ -53,20 +53,6 @@ struct semid_ds
unsigned long int __unused2; unsigned long int __unused2;
}; };
#ifdef __LIBC_IPC_INTERNAL
struct __old_semid_ds
{
struct __old_ipc_perm sem_perm; /* operation permission struct */
__time_t sem_otime; /* last semop() time */
__time_t sem_ctime; /* last time changed by semctl() */
struct sem *__sembase; /* ptr to first semaphore in array */
struct sem_queue *__sem_pending; /* pending operations */
struct sem_queue *__sem_pending_last; /* last pending operation */
struct sem_undo *__undo; /* ondo requests on this array */
unsigned short int sem_nsems; /* number of semaphores in set */
};
#endif
/* The user should define a union like the following to use it for arguments /* The user should define a union like the following to use it for arguments
for `semctl'. for `semctl'.

View File

@ -61,23 +61,6 @@ struct shmid_ds
unsigned long int __unused2; unsigned long int __unused2;
}; };
#ifdef __LIBC_IPC_INTERNAL
struct __old_shmid_ds
{
struct __old_ipc_perm shm_perm; /* operation permission struct */
int shm_segsz; /* size of segment in bytes */
__time_t shm_atime; /* time of last shmat() */
__time_t shm_dtime; /* time of last shmdt() */
__time_t shm_ctime; /* time of last change by shmctl() */
__ipc_pid_t shm_cpid; /* pid of creator */
__ipc_pid_t shm_lpid; /* pid of last shmop */
unsigned short int shm_nattch; /* number of current attaches */
unsigned short int __shm_npages; /* size of segment (pages) */
unsigned long int *__shm_pages; /* array of ptrs to frames -> SHMMAX */
struct vm_area_struct *__attaches; /* descriptors for attaches */
};
#endif
#ifdef __USE_MISC #ifdef __USE_MISC
/* ipcs ctl commands */ /* ipcs ctl commands */
@ -101,15 +84,6 @@ struct shminfo
unsigned long __unused4; unsigned long __unused4;
}; };
struct __old_shminfo
{
int shmmax;
int shmmin;
int shmmni;
int shmseg;
int shmall;
};
struct shm_info struct shm_info
{ {
int used_ids; int used_ids;

View File

@ -19,6 +19,7 @@
#include <errno.h> #include <errno.h>
#include <sys/msg.h> #include <sys/msg.h>
#include <ipc_priv.h>
#include <sysdep.h> #include <sysdep.h>
#include <sys/syscall.h> #include <sys/syscall.h>

View File

@ -20,6 +20,7 @@
#include <errno.h> #include <errno.h>
#include <stdarg.h> #include <stdarg.h>
#include <sys/sem.h> #include <sys/sem.h>
#include <ipc_priv.h>
#include <sysdep.h> #include <sysdep.h>
#include <sys/syscall.h> #include <sys/syscall.h>

View File

@ -19,6 +19,7 @@
#include <errno.h> #include <errno.h>
#include <sys/shm.h> #include <sys/shm.h>
#include <ipc_priv.h>
#include <sysdep.h> #include <sysdep.h>
#include <sys/syscall.h> #include <sys/syscall.h>