mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-20 03:50:07 +00:00
6b87a5642c
* sysdeps/mach/hurd/chown.c: Use INTDEF for __chown. * sysdeps/unix/sysv/aix/chown.c: Likewise. * sysdeps/unix/grantpt.c: Use INTUSE for __chown calls. * sysdeps/unix/sysv/linux/m68k/chown.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/chown.c: Likewise. * sysdeps/unix/sysv/linux/i386/chown.c: Use INTDEF2 to define __chown_internal. * sysdeps/unix/sysv/linux/s390/s390-32//chown.c: Likewise. * intl/dcngettext.c [_LIBC]: Use INTUSE for __dcngettext. * intl/dngettext.c [_LIBC] (DCNGETTEXT): Use INTUSE. * intl/ngettext.c: Likewise. * include/sys/socket.h: Declare __connect_internal and define __connect macro if not NOT_IN_libc. * sysdeps/mach/hurd/connect.c: Use INTDEF for __connect. * sysdeps/unix/sysv/aix/connect.c: Likewise. * sysdeps/unix/sysv/linux/connect.S: Add __connect_internal alias. * include/unistd.h: Declare __close_internal and define __close macro if not NOT_IN_libc. * libio/libioP.h (JUMO0, JUMP1, JUMP2, JUMP3, WJUMP0, WJUMP1, WJUMP2, WJUMP3): Add extra parenthesis to avoid expanding element names with macors like __close. * sysdeps/unix/syscalls.list: Add __close_internal alias. * include/unistd.h: Declare __dup2_internal and define __dup2 macro if not NOT_IN_libc. * sysdeps/mach/hurd/dup2.c: Use INTDEF for __dup2. * sysdeps/posix/dup2.c: Use INTDEF for __dup2. * sysdeps/unix/syscalls.list: Add __dup2_internal alias. * include/unistd.h: Declare __fork_internal and define __fork macro if not NOT_IN_libc. * sysdeps/mach/hurd/fork.c: Use INTDEF for __fork. * sysdeps/unix/sysv/aix/fork.c: Likewise. * sysdeps/unix/sysv/linux/syscalls.list: Add __fork_internal alias. * include/stdio_ext.h: Declare __fsetlocking_internal and define __fsetlocking macro to use it if not NOT_IN_libc. * libio/__fsetlocking.c: Use INTDEF for __fsetlocking. * libio/__fbufsize.c: Correct copyright. * libio/__flbf.c: Likewise. * libio/__fpending.c: Likewise. * libio/__fpurge.c: Likewise. * libio/__freadable.c: Likewise. * libio/__freading.c: Likewise. * libio/__fsetlocking.c: Likewise. * libio/__fwritable.c: Likewise. * libio/__fwriting.c: Likewise. * include/stdio.h: Declare __asprintf_internal and define __asprintf macro to use it if not NOT_IN_libc. * stdio-common/asprintf.c: Use INTDEF for __asprintf. * include/mntent.h: Declare __setmntent_internal, __getmntent_r_internal, __endmntent_internal. Define __setmntent, __getmntent_r, and __endmntent macros to use these functions if not NOT_IN_libc. * misc/mntent_r.c: Use INTDEF for __setmntent, __getmntent_r, and __endmntent. * include/math.h: Declare __finite_internal, __finitef_internal, and __finitel_internal. Redefine isfinite macro if in libc or libm using these functions. * sysdeps/generic/s_ldexp.c: Use INTUSE for __finite calls. * sysdeps/generic/s_ldexpf.c: Use INTUSE for __finitef calls. * sysdeps/generic/s_ldexpl.c: Use INTUSE for __finitel calls. * sysdeps/i386/fpu/s_finite.S: Define _internal alias. * sysdeps/i386/fpu/s_finitef.S: Likewise. * sysdeps/i386/fpu/s_finitel.S: Likewise. * sysdeps/ieee754/dbl-64/s_finite.c: Likewise. * sysdeps/ieee754/flt-32/s_finitef.c: Likewise. * sysdeps/ieee754/ldbl-128/s_finitel.c: Likewise. * sysdeps/ieee754/ldbl-96/s_finitel.c: Likewise. * include/fcntl.h: Declare __fcntl_internal. Define __fcntl macro to use this function if not NOT_IN_libc. * libio/iofdopen.c (_IO_fcntl): Use INTUSE. * sysdeps/generic/fcntl.c: Use INTDEF for __fcntl. * sysdeps/mach/hurd/fcntl.c: Likewise. * sysdeps/unix/sysv/aix/fcntl.c: Likewise. * sysdeps/unix/sysv/linux/i386/fcntl.c: Likewise. * include/argz.h: Declare __argz_count_internal and __argz_stringify_internal. * intl/l10nflist.c [_LIBC]: Use INTUSE for __argz_count and __argz_stringify. * string/argz-count.c: Use INTDEF for __argz_count. * string/argz-stringify.c: Use INTDEF for __argz_stringify. * include/stdlib.h: Declare __cxa_atexit_internal and define __cxa_atexit macro if not NOT_IN_libc. * stdlib/cxa_atexit.c: Use INTDEF for __cxa_atexit. * dlfcn/Makefile: Define NOT_IN_libc when compiling modcxaatexit.c. * assert/assert.c: Use INTDEF for __assert_fail. * assert/__assert.c: Use INTUSE for call to __assert_fail. * include/assert.h: Declare __assert_fail_internal.
139 lines
3.8 KiB
C
139 lines
3.8 KiB
C
/* Copyright (C) 1991, 92, 93, 94, 95, 97, 2002 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 Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <unistd.h>
|
|
#include <hurd.h>
|
|
#include <hurd/fd.h>
|
|
|
|
#undef __dup2
|
|
|
|
|
|
/* Duplicate FD to FD2, closing the old FD2 and making FD2 be
|
|
open on the same file as FD is. Return FD2 or -1. */
|
|
int
|
|
__dup2 (fd, fd2)
|
|
int fd;
|
|
int fd2;
|
|
{
|
|
struct hurd_fd *d;
|
|
|
|
/* Extract the ports and flags from FD. */
|
|
d = _hurd_fd_get (fd);
|
|
if (d == NULL)
|
|
{
|
|
errno = EBADF;
|
|
return -1;
|
|
}
|
|
|
|
HURD_CRITICAL_BEGIN;
|
|
|
|
__spin_lock (&d->port.lock);
|
|
if (d->port.port == MACH_PORT_NULL)
|
|
{
|
|
__spin_unlock (&d->port.lock);
|
|
errno = EBADF;
|
|
fd2 = -1;
|
|
}
|
|
else if (fd2 == fd)
|
|
/* FD is valid and FD2 is already the same; just return it. */
|
|
__spin_unlock (&d->port.lock);
|
|
else
|
|
{
|
|
struct hurd_userlink ulink, ctty_ulink;
|
|
int flags = d->flags;
|
|
io_t ctty = _hurd_port_get (&d->ctty, &ctty_ulink);
|
|
io_t port = _hurd_port_locked_get (&d->port, &ulink); /* Unlocks D. */
|
|
|
|
if (fd2 < 0)
|
|
{
|
|
errno = EBADF;
|
|
fd2 = -1;
|
|
}
|
|
else
|
|
{
|
|
/* Get a hold of the destination descriptor. */
|
|
struct hurd_fd *d2;
|
|
|
|
if (fd2 >= _hurd_dtablesize)
|
|
{
|
|
/* The table is not large enough to hold the destination
|
|
descriptor. Enlarge it as necessary to allocate this
|
|
descriptor. */
|
|
__mutex_unlock (&_hurd_dtable_lock);
|
|
/* We still hold FD1's lock, but this is safe because
|
|
_hurd_alloc_fd will only examine the cells starting
|
|
at FD2. */
|
|
d2 = _hurd_alloc_fd (NULL, fd2);
|
|
if (d2)
|
|
__spin_unlock (&d2->port.lock);
|
|
__mutex_lock (&_hurd_dtable_lock);
|
|
}
|
|
else
|
|
{
|
|
d2 = _hurd_dtable[fd2];
|
|
if (d2 == NULL)
|
|
{
|
|
/* Must allocate a new one. We don't initialize the port
|
|
cells with this call so that if it fails (out of
|
|
memory), we will not have already added user
|
|
references for the ports, which we would then have to
|
|
deallocate. */
|
|
d2 = _hurd_dtable[fd2] = _hurd_new_fd (MACH_PORT_NULL,
|
|
MACH_PORT_NULL);
|
|
}
|
|
}
|
|
|
|
if (d2 == NULL)
|
|
{
|
|
fd2 = -1;
|
|
if (errno == EINVAL)
|
|
errno = EBADF; /* POSIX.1-1990 6.2.1.2 ll 54-55. */
|
|
}
|
|
else
|
|
{
|
|
/* Give the ports each a user ref for the new descriptor. */
|
|
__mach_port_mod_refs (__mach_task_self (), port,
|
|
MACH_PORT_RIGHT_SEND, 1);
|
|
if (ctty != MACH_PORT_NULL)
|
|
__mach_port_mod_refs (__mach_task_self (), ctty,
|
|
MACH_PORT_RIGHT_SEND, 1);
|
|
|
|
/* Install the ports and flags in the new descriptor slot. */
|
|
__spin_lock (&d2->port.lock);
|
|
d2->flags = flags & ~FD_CLOEXEC; /* Dup clears FD_CLOEXEC. */
|
|
_hurd_port_set (&d2->ctty, ctty);
|
|
_hurd_port_locked_set (&d2->port, port); /* Unlocks D2. */
|
|
}
|
|
}
|
|
__mutex_unlock (&_hurd_dtable_lock);
|
|
|
|
_hurd_port_free (&d->port, &ulink, port);
|
|
if (ctty != MACH_PORT_NULL)
|
|
_hurd_port_free (&d->ctty, &ctty_ulink, port);
|
|
}
|
|
|
|
HURD_CRITICAL_END;
|
|
|
|
return fd2;
|
|
}
|
|
|
|
INTDEF(__dup2)
|
|
weak_alias (__dup2, dup2)
|