From e9dcb080809726a5531d2b5932b7f47e61d4bc49 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 15 Dec 1998 16:47:38 +0000 Subject: Update. * sysdeps/unix/sysv/linux/msgctl.c: Use INLINE_SYSCALL. * 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/semctl.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/shmctl.c: Likewise. * sysdeps/unix/sysv/linux/shmdt.c: Likewise. * sysdeps/unix/sysv/linux/shmget.c: Likewise. * sysdeps/unix/sysv/linux/syscalls.list: Remove ipc syscall here. * sysdeps/unix/sysv/linux/powerpc/syscalls.list: Add ipc syscall here. * time/strftime.c: Remove 'f' format. * time/strptime.c (get_number): Ignore trailing whitespace. (strptime_internal): Handle 'F' and 'k' formats. --- sysdeps/unix/sysv/linux/msgctl.c | 8 ++++++-- sysdeps/unix/sysv/linux/msgget.c | 8 ++++++-- sysdeps/unix/sysv/linux/msgrcv.c | 6 +++++- sysdeps/unix/sysv/linux/msgsnd.c | 8 ++++++-- sysdeps/unix/sysv/linux/powerpc/syscalls.list | 1 + sysdeps/unix/sysv/linux/semctl.c | 6 +++++- sysdeps/unix/sysv/linux/semget.c | 8 ++++++-- sysdeps/unix/sysv/linux/semop.c | 8 ++++++-- sysdeps/unix/sysv/linux/shmat.c | 9 +++++++-- sysdeps/unix/sysv/linux/shmctl.c | 8 ++++++-- sysdeps/unix/sysv/linux/shmdt.c | 8 ++++++-- sysdeps/unix/sysv/linux/shmget.c | 8 ++++++-- sysdeps/unix/sysv/linux/syscalls.list | 1 - 13 files changed, 66 insertions(+), 21 deletions(-) (limited to 'sysdeps/unix') diff --git a/sysdeps/unix/sysv/linux/msgctl.c b/sysdeps/unix/sysv/linux/msgctl.c index 6a0b7d683d..7f0d7c55a4 100644 --- a/sysdeps/unix/sysv/linux/msgctl.c +++ b/sysdeps/unix/sysv/linux/msgctl.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , August 1995. @@ -17,8 +17,12 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include +#include +#include + /* Allows to control internal state and destruction of message queue objects. */ @@ -28,5 +32,5 @@ msgctl (msqid, cmd, buf) int cmd; struct msqid_ds *buf; { - return __ipc (IPCOP_msgctl, msqid, cmd, 0, buf); + return INLINE_SYSCALL (ipc, 5, IPCOP_msgctl, msqid, cmd, 0, buf); } diff --git a/sysdeps/unix/sysv/linux/msgget.c b/sysdeps/unix/sysv/linux/msgget.c index c073614ef1..f9788d6e54 100644 --- a/sysdeps/unix/sysv/linux/msgget.c +++ b/sysdeps/unix/sysv/linux/msgget.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , August 1995. @@ -17,9 +17,13 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include #include /* for definition of NULL */ +#include +#include + /* Return descriptor for message queue associated with KEY. The MSGFLG parameter describes how to proceed with clashing of key values. */ @@ -28,5 +32,5 @@ msgget (key, msgflg) key_t key; int msgflg; { - return __ipc (IPCOP_msgget, key, msgflg, 0, NULL); + return INLINE_SYSCALL (ipc, 5, IPCOP_msgget, key, msgflg, 0, NULL); } diff --git a/sysdeps/unix/sysv/linux/msgrcv.c b/sysdeps/unix/sysv/linux/msgrcv.c index a8a0dea3fe..30169fb3a6 100644 --- a/sysdeps/unix/sysv/linux/msgrcv.c +++ b/sysdeps/unix/sysv/linux/msgrcv.c @@ -17,8 +17,12 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include +#include +#include + /* Kludge to work around Linux' restriction of only up to five arguments to a system call. */ @@ -44,5 +48,5 @@ msgrcv (msqid, msgp, msgsz, msgtyp, msgflg) tmp.msgp = msgp; tmp.msgtyp = msgtyp; - return __ipc (IPCOP_msgrcv, msqid, msgsz, msgflg, &tmp); + return INLINE_SYSCALL (ipc, 5, IPCOP_msgrcv, msqid, msgsz, msgflg, &tmp); } diff --git a/sysdeps/unix/sysv/linux/msgsnd.c b/sysdeps/unix/sysv/linux/msgsnd.c index 739323495c..c279b2e52e 100644 --- a/sysdeps/unix/sysv/linux/msgsnd.c +++ b/sysdeps/unix/sysv/linux/msgsnd.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , August 1995. @@ -17,8 +17,12 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include +#include +#include + int msgsnd (msqid, msgp, msgsz, msgflg) int msqid; @@ -26,5 +30,5 @@ msgsnd (msqid, msgp, msgsz, msgflg) size_t msgsz; int msgflg; { - return __ipc (IPCOP_msgsnd, msqid, msgsz, msgflg, msgp); + return INLINE_SYSCALL (ipc, 5, IPCOP_msgsnd, msqid, msgsz, msgflg, msgp); } diff --git a/sysdeps/unix/sysv/linux/powerpc/syscalls.list b/sysdeps/unix/sysv/linux/powerpc/syscalls.list index 33132142a6..2d95d67046 100644 --- a/sysdeps/unix/sysv/linux/powerpc/syscalls.list +++ b/sysdeps/unix/sysv/linux/powerpc/syscalls.list @@ -2,6 +2,7 @@ # System calls with wrappers. s_ioctl ioctl ioctl 3 __syscall_ioctl +s_ipc msgget ipc 5 __syscall_ipc s_llseek llseek _llseek 5 __syscall__llseek s_chown chown chown 3 __syscall_chown rt_sigaction - rt_sigaction 4 __syscall_rt_sigaction diff --git a/sysdeps/unix/sysv/linux/semctl.c b/sysdeps/unix/sysv/linux/semctl.c index c87b407d2c..4bc63bd71c 100644 --- a/sysdeps/unix/sysv/linux/semctl.c +++ b/sysdeps/unix/sysv/linux/semctl.c @@ -17,9 +17,13 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include #include +#include +#include + /* Define a `union semun' suitable for Linux here. */ union semun { @@ -46,5 +50,5 @@ semctl (int semid, int semnum, int cmd, ...) va_end (ap); - return __ipc (IPCOP_semctl, semid, semnum, cmd, arg); + return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd, arg); } diff --git a/sysdeps/unix/sysv/linux/semget.c b/sysdeps/unix/sysv/linux/semget.c index b9f41f5c7c..60a150a9fd 100644 --- a/sysdeps/unix/sysv/linux/semget.c +++ b/sysdeps/unix/sysv/linux/semget.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , August 1995. @@ -17,9 +17,13 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include #include /* for definition of NULL */ +#include +#include + /* Return identifier for array of NSEMS semaphores associated with KEY. */ @@ -29,5 +33,5 @@ semget (key, nsems, semflg) int nsems; int semflg; { - return __ipc (IPCOP_semget, key, nsems, semflg, NULL); + return INLINE_SYSCALL (ipc, 5, IPCOP_semget, key, nsems, semflg, NULL); } diff --git a/sysdeps/unix/sysv/linux/semop.c b/sysdeps/unix/sysv/linux/semop.c index 563aaae414..bd120bf4b3 100644 --- a/sysdeps/unix/sysv/linux/semop.c +++ b/sysdeps/unix/sysv/linux/semop.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , August 1995. @@ -17,8 +17,12 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include +#include +#include + /* Perform user-defined atomical operation of array of semaphores. */ int @@ -27,5 +31,5 @@ semop (semid, sops, nsops) struct sembuf *sops; unsigned int nsops; { - return __ipc (IPCOP_semop, semid, (int) nsops, 0, sops); + return INLINE_SYSCALL (ipc, 5, IPCOP_semop, semid, (int) nsops, 0, sops); } diff --git a/sysdeps/unix/sysv/linux/shmat.c b/sysdeps/unix/sysv/linux/shmat.c index 9d36b26aa2..9ebac49537 100644 --- a/sysdeps/unix/sysv/linux/shmat.c +++ b/sysdeps/unix/sysv/linux/shmat.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , August 1995. @@ -17,8 +17,12 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include +#include +#include + /* Attach the shared memory segment associated with SHMID to the data segment of the calling process. SHMADDR and SHMFLG determine how and where the segment is attached. */ @@ -32,7 +36,8 @@ shmat (shmid, shmaddr, shmflg) int retval; unsigned long raddr; - retval = __ipc (IPCOP_shmat, shmid, shmflg, (int) &raddr, (void *) shmaddr); + retval = INLINE_SYSCALL (ipc, 5, IPCOP_shmat, shmid, shmflg, (int) &raddr, + (void *) shmaddr); return ((unsigned long int) retval > -(unsigned long int) SHMLBA ? (void *) retval : (void *) raddr); } diff --git a/sysdeps/unix/sysv/linux/shmctl.c b/sysdeps/unix/sysv/linux/shmctl.c index f25d4194b5..890e700a30 100644 --- a/sysdeps/unix/sysv/linux/shmctl.c +++ b/sysdeps/unix/sysv/linux/shmctl.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , August 1995. @@ -17,8 +17,12 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include +#include +#include + /* Provide operations to control over shared memory segments. */ int @@ -27,5 +31,5 @@ shmctl (shmid, cmd, buf) int cmd; struct shmid_ds *buf; { - return __ipc (IPCOP_shmctl, shmid, cmd, 0, buf); + return INLINE_SYSCALL (ipc, 5, IPCOP_shmctl, shmid, cmd, 0, buf); } diff --git a/sysdeps/unix/sysv/linux/shmdt.c b/sysdeps/unix/sysv/linux/shmdt.c index 70526e6ae0..1d1a1847d1 100644 --- a/sysdeps/unix/sysv/linux/shmdt.c +++ b/sysdeps/unix/sysv/linux/shmdt.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , August 1995. @@ -17,8 +17,12 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include +#include +#include + /* Detach shared memory segment starting at address specified by SHMADDR from the caller's data segment. */ @@ -26,5 +30,5 @@ int shmdt (shmaddr) const void *shmaddr; { - return __ipc (IPCOP_shmdt, 0, 0, 0, (void *) shmaddr); + return INLINE_SYSCALL (ipc, 5, IPCOP_shmdt, 0, 0, 0, (void *) shmaddr); } diff --git a/sysdeps/unix/sysv/linux/shmget.c b/sysdeps/unix/sysv/linux/shmget.c index 8754191862..73bfe97dc7 100644 --- a/sysdeps/unix/sysv/linux/shmget.c +++ b/sysdeps/unix/sysv/linux/shmget.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , August 1995. @@ -17,9 +17,13 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include #include /* for definition of NULL */ +#include +#include + /* Return an identifier for an shared memory segment of at least size SIZE which is associated with KEY. */ @@ -29,5 +33,5 @@ shmget (key, size, shmflg) int size; int shmflg; { - return __ipc (IPCOP_shmget, key, size, shmflg, NULL); + return INLINE_SYSCALL (ipc, 5, IPCOP_shmget, key, size, shmflg, NULL); } diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list index ccec06a861..9f6afe408c 100644 --- a/sysdeps/unix/sysv/linux/syscalls.list +++ b/sysdeps/unix/sysv/linux/syscalls.list @@ -19,7 +19,6 @@ getsid - getsid 1 getsid init_module EXTRA init_module 5 init_module ioperm - ioperm 3 ioperm iopl - iopl 1 iopl -ipc msgget ipc 5 __ipc klogctl EXTRA syslog 3 klogctl lchown - lchown 3 __lchown lchown mlock EXTRA mlock 2 __mlock mlock -- cgit 1.4.1