mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
8f0c527e13
* hurd/hurd-raise.c (_hurd_raise_signal): Pass sigcode in msg_sig_post rpc. * hurd/hurdmsg.c (_S_msg_set_environment): Use argz.h functions instead of _hurd_split_args. (_S_msg_*_exec_flags): Functions removed. (_S_msg_startup_dosync): Stub removed. Sat May 4 02:11:55 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * sysdeps/mach/hurd/ptrace.c: Set _hurdsig_traced instead of EXEC_TRACED bit in _hurd_exec_flags. Pass sigcode arg in msg_sig_post_untraced rpc. * sysdeps/mach/hurd/access.c: Don't pass io port in auth_user_authenticate rpc. * posix/sched.h: Fix typos. * sysdeps/mach/hurd/fork.c: Use new critical section lock. Clear _hurdsig_traced instead of EXEC_TRACED. * sysdeps/stub/nanosleep.c (nanosleep): Fix typo. * wcsmbs/wcstol.c: Find strtol.c in ../stdlib. * wcsmbs/wcstof.c: Find strtod.c in ../stdlib. * wcsmbs/wcstod.c: Likewise. * wcsmbs/wcstold.c: Likewise. * wcsmbs/wcwidth.h: Find cname-lookup.h in ../wctype. * string/envz.c (envz_entry): Use const. (envz_get, envz_remove): Likewise. (envz_entry): Return char *, not const char *. * string/envz.h: Fix decl. * string/argz-create.c: Use const in prototype. * string/argz-next.c: Likewise. * sysdeps/mach/hurd/sigprocmask.c: Pass sigcode arg to msg_sig_post. * sysdeps/mach/hurd/i386/sigreturn.c: Likewise. * sysdeps/mach/hurd/sigsuspend.c: Likewise. * sysdeps/mach/hurd/kill.c: Likewise. * hurd/hurdexec.c (_hurd_exec): Use new critical section lock. * hurd/catch-exc.c (_S_catch_exception_raise): Likewise. * hurd/sigunwind.c (_hurdsig_longjmp_from_handler): Likewise. * hurd/thread-cancel.c (hurd_thread_cancel, hurd_check_cancel): Likewise. * sysdeps/mach/hurd/jmp-unwind.c (_longjmp_unwind): Likewise. * sysdeps/mach/hurd/sigaction.c: Likewise. * sysdeps/mach/hurd/errnos.awk: Don't use ARGV in comment; it can change meaninglessly. * hurd/hurd/signal.h (struct hurd_sigstate): Replace critical section flag with a spin lock. (_hurd_critical_section_lock): Use spin_try_lock on that to see if we get it. No need to take SS->lock at all. (_hurd_critical_section_unlock): Unlock SS->critical_section_lock instead of clearing the old flag member. * hurd/hurdsig.c (_hurd_internal_post_signal): Use spin_lock_locked to test the critical section state. * hurd/hurdinit.c (_hurd_init): Set _hurdsig_traced from the intarray. * hurd/hurdkill.c (_hurd_sig_post): Pass 0 sigcode in msg_sig_post. * hurd/hurdsig.c (_hurd_internal_post_signal): Test _hurdsig_traced instead of testing (_hurd_exec_flags & EXEC_TRACED). (_S_msg_sig_post): Take sigcode arg and pass it through. (_S_msg_sig_post_untraced): Likewise. (reauth_proc): Don't pass proc port in auth_user_authenticate. * hurd/setauth.c (_hurd_setauth): Don't pass object ports in auth_user_authenticate RPCs, just the one-off rendezvous port. * hurd/dtable.c (reauth_dtable): Likewise. * hurd/hurdlookup.c (__hurd_file_name_lookup_retry): Likewise. * hurd/hurdexec.c (_hurd_exec): Pass 0 flags to file_exec. Pass sigcode arg to msg_sig_post. * string/argz.h (argz_create): Use const in prototype. * hurd/hurdinit.c (_hurd_proc_init): Test _hurdsig_traced instead of testing (_hurd_exec_flags & EXEC_TRACED). Pass sigcode arg to msg_sig_post. * hurd/hurd.h: Declare _hurdsig_traced. * string/argz.h (__argz_next): Cast ENTRY before returning it. * hurd/hurd/signal.h (_hurd_critical_section_unlock): Pass sigcode arg to msg_sig_post. * hurd/path-lookup.c: New file. * hurd/Makefile (routines): Add path-lookup. * hurd/hurd/lookup.h: Declare file_name_path_scan, hurd_file_name_path_lookup. * hurd/hurd.h: Declare file_name_path_lookup. * sysdeps/mach/hurd/select.c: The io_select rpc no longer has a TAG_ID argument. Instead, use a separate reply port for each RPC and put them all in a port set to wait for slow replies.
233 lines
7.3 KiB
C
233 lines
7.3 KiB
C
/* Copyright (C) 1991, 92, 93, 94, 95, 96 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., 675 Mass Ave,
|
|
Cambridge, MA 02139, USA. */
|
|
|
|
#include <errno.h>
|
|
#include <unistd.h>
|
|
#include <fcntl.h>
|
|
#include <limits.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <hurd.h>
|
|
#include <hurd/fd.h>
|
|
#include <hurd/signal.h>
|
|
#include <assert.h>
|
|
#include <argz.h>
|
|
|
|
/* Overlay TASK, executing FILE with arguments ARGV and environment ENVP.
|
|
If TASK == mach_task_self (), some ports are dealloc'd by the exec server.
|
|
ARGV and ENVP are terminated by NULL pointers. */
|
|
error_t
|
|
_hurd_exec (task_t task, file_t file,
|
|
char *const argv[], char *const envp[])
|
|
{
|
|
error_t err;
|
|
char *args, *env;
|
|
size_t argslen, envlen;
|
|
int ints[INIT_INT_MAX];
|
|
mach_port_t ports[_hurd_nports];
|
|
struct hurd_userlink ulink_ports[_hurd_nports];
|
|
file_t *dtable;
|
|
unsigned int dtablesize, i;
|
|
struct hurd_port **dtable_cells;
|
|
struct hurd_userlink *ulink_dtable;
|
|
struct hurd_sigstate *ss;
|
|
mach_port_t *please_dealloc, *pdp;
|
|
|
|
/* XXX needs to be hurdmalloc XXX */
|
|
if (err = __argz_create (argv, &args, &argslen))
|
|
return err;
|
|
if (err = __argz_create (envp, &env, &envlen))
|
|
goto outargs;
|
|
|
|
/* Load up the ports to give to the new program. */
|
|
for (i = 0; i < _hurd_nports; ++i)
|
|
if (i == INIT_PORT_PROC && task != __mach_task_self ())
|
|
{
|
|
/* This is another task, so we need to ask the proc server
|
|
for the right proc server port for it. */
|
|
if (err = __USEPORT (PROC, __proc_task2proc (port, task, &ports[i])))
|
|
{
|
|
while (--i > 0)
|
|
_hurd_port_free (&_hurd_ports[i], &ulink_ports[i], ports[i]);
|
|
goto outenv;
|
|
}
|
|
}
|
|
else
|
|
ports[i] = _hurd_port_get (&_hurd_ports[i], &ulink_ports[i]);
|
|
|
|
|
|
/* Load up the ints to give the new program. */
|
|
for (i = 0; i < INIT_INT_MAX; ++i)
|
|
switch (i)
|
|
{
|
|
case INIT_UMASK:
|
|
ints[i] = _hurd_umask;
|
|
break;
|
|
|
|
case INIT_SIGMASK:
|
|
case INIT_SIGIGN:
|
|
case INIT_SIGPENDING:
|
|
/* We will set these all below. */
|
|
break;
|
|
|
|
default:
|
|
ints[i] = 0;
|
|
}
|
|
|
|
ss = _hurd_self_sigstate ();
|
|
|
|
assert (! __spin_lock_locked (&ss->critical_section_lock));
|
|
__spin_lock (&ss->critical_section_lock);
|
|
|
|
__spin_lock (&ss->lock);
|
|
ints[INIT_SIGMASK] = ss->blocked;
|
|
ints[INIT_SIGPENDING] = ss->pending;
|
|
ints[INIT_SIGIGN] = 0;
|
|
for (i = 1; i < NSIG; ++i)
|
|
if (ss->actions[i].sa_handler == SIG_IGN)
|
|
ints[INIT_SIGIGN] |= __sigmask (i);
|
|
|
|
/* We hold the sigstate lock until the exec has failed so that no signal
|
|
can arrive between when we pack the blocked and ignored signals, and
|
|
when the exec actually happens. A signal handler could change what
|
|
signals are blocked and ignored. Either the change will be reflected
|
|
in the exec, or the signal will never be delivered. Setting the
|
|
critical section flag avoids anything we call trying to acquire the
|
|
sigstate lock. */
|
|
|
|
__spin_unlock (&ss->lock);
|
|
|
|
/* Pack up the descriptor table to give the new program. */
|
|
__mutex_lock (&_hurd_dtable_lock);
|
|
|
|
dtablesize = _hurd_dtable ? _hurd_dtablesize : _hurd_init_dtablesize;
|
|
|
|
if (task == __mach_task_self ())
|
|
/* Request the exec server to deallocate some ports from us if the exec
|
|
succeeds. The init ports and descriptor ports will arrive in the
|
|
new program's exec_startup message. If we failed to deallocate
|
|
them, the new program would have duplicate user references for them.
|
|
But we cannot deallocate them ourselves, because we must still have
|
|
them after a failed exec call. */
|
|
please_dealloc = __alloca ((_hurd_nports + (2 * dtablesize))
|
|
* sizeof (mach_port_t));
|
|
else
|
|
please_dealloc = NULL;
|
|
pdp = please_dealloc;
|
|
|
|
if (_hurd_dtable != NULL)
|
|
{
|
|
dtable = __alloca (dtablesize * sizeof (dtable[0]));
|
|
ulink_dtable = __alloca (dtablesize * sizeof (ulink_dtable[0]));
|
|
dtable_cells = __alloca (dtablesize * sizeof (dtable_cells[0]));
|
|
for (i = 0; i < dtablesize; ++i)
|
|
{
|
|
struct hurd_fd *const d = _hurd_dtable[i];
|
|
if (d == NULL)
|
|
{
|
|
dtable[i] = MACH_PORT_NULL;
|
|
continue;
|
|
}
|
|
__spin_lock (&d->port.lock);
|
|
if (d->flags & FD_CLOEXEC)
|
|
{
|
|
/* This descriptor is marked to be closed on exec.
|
|
So don't pass it to the new program. */
|
|
dtable[i] = MACH_PORT_NULL;
|
|
if (pdp && d->port.port != MACH_PORT_NULL)
|
|
{
|
|
/* We still need to deallocate the ports. */
|
|
*pdp++ = d->port.port;
|
|
if (d->ctty.port != MACH_PORT_NULL)
|
|
*pdp++ = d->ctty.port;
|
|
}
|
|
__spin_unlock (&d->port.lock);
|
|
}
|
|
else
|
|
{
|
|
if (pdp && d->ctty.port != MACH_PORT_NULL)
|
|
/* All the elements of DTABLE are added to PLEASE_DEALLOC
|
|
below, so we needn't add the port itself.
|
|
But we must deallocate the ctty port as well as
|
|
the normal port that got installed in DTABLE[I]. */
|
|
*pdp++ = d->ctty.port;
|
|
dtable[i] = _hurd_port_locked_get (&d->port, &ulink_dtable[i]);
|
|
dtable_cells[i] = &d->port;
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
dtable = _hurd_init_dtable;
|
|
ulink_dtable = NULL;
|
|
dtable_cells = NULL;
|
|
}
|
|
|
|
/* The information is all set up now. Try to exec the file. */
|
|
|
|
{
|
|
if (pdp)
|
|
{
|
|
/* Request the exec server to deallocate some ports from us if the exec
|
|
succeeds. The init ports and descriptor ports will arrive in the
|
|
new program's exec_startup message. If we failed to deallocate
|
|
them, the new program would have duplicate user references for them.
|
|
But we cannot deallocate them ourselves, because we must still have
|
|
them after a failed exec call. */
|
|
|
|
for (i = 0; i < _hurd_nports; ++i)
|
|
*pdp++ = ports[i];
|
|
for (i = 0; i < dtablesize; ++i)
|
|
*pdp++ = dtable[i];
|
|
}
|
|
|
|
err = __file_exec (file, task, 0,
|
|
args, argslen, env, envlen,
|
|
dtable, MACH_MSG_TYPE_COPY_SEND, dtablesize,
|
|
ports, MACH_MSG_TYPE_COPY_SEND, _hurd_nports,
|
|
ints, INIT_INT_MAX,
|
|
please_dealloc, pdp - please_dealloc,
|
|
&_hurd_msgport, task == __mach_task_self () ? 1 : 0);
|
|
}
|
|
|
|
/* Release references to the standard ports. */
|
|
for (i = 0; i < _hurd_nports; ++i)
|
|
if (i == INIT_PORT_PROC && task != __mach_task_self ())
|
|
__mach_port_deallocate (__mach_task_self (), ports[i]);
|
|
else
|
|
_hurd_port_free (&_hurd_ports[i], &ulink_ports[i], ports[i]);
|
|
|
|
if (ulink_dtable != NULL)
|
|
/* Release references to the file descriptor ports. */
|
|
for (i = 0; i < dtablesize; ++i)
|
|
if (dtable[i] != MACH_PORT_NULL)
|
|
_hurd_port_free (dtable_cells[i], &ulink_dtable[i], dtable[i]);
|
|
|
|
/* Release lock on the file descriptor table. */
|
|
__mutex_unlock (&_hurd_dtable_lock);
|
|
|
|
/* Safe to let signals happen now. */
|
|
_hurd_critical_section_unlock (ss);
|
|
|
|
outargs:
|
|
free (args);
|
|
outenv:
|
|
free (env);
|
|
return err;
|
|
}
|