mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-06 13:20:06 +00:00
a585ba226b
__libc_system. (__libc_system): Call it, putting just the line == NULL test here. * include/libc-symbols.h (__hidden_proto): Add extern keywords so variables work right. * elf/dl-open.c (dl_open_worker): Use _ macro instead of gettext. * elf/dl-close.c (_dl_close): Likewise. * include/netinet/in.h: Use libc_hidden_proto for bindresvport, in6addr_any, in6addr_loopback. Remove decls for bindresvport_internal, in6addr_any_internal, in6addr_loopback_internal. * sunrpc/svc_udp.c (svcudp_bufcreate): Nix INTUSE for bindresvport. * sunrpc/svc_tcp.c (svctcp_create): Likewise. * sunrpc/clnt_udp.c (clntudp_bufcreate): Likewise. * sunrpc/bindrsvprt.c: Change INTDEF to libc_hidden_def. * inet/in6_addr.c: Change INTVARDEF to libc_hidden_def. * sysdeps/posix/getaddrinfo.c (gaih_inet): Nix INTUSE for in6addr_loopback. * inet/gethstbyad_r.c (PREPROCESS): Nix INTUSE for in6addr_any. * include/netinet/ether.h: Use libc_hidden_proto for ether_ntoa_r, ether_aton_r. * inet/ether_aton_r.c: Add libc_hidden_def. * inet/ether_ntoa_r.c: Likewise. * include/rpc/auth.h: Use libc_hidden_proto for getnetname, netname2user, host2netname. * sunrpc/netname.c: Add libc_hidden_def. * include/netdb.h: Use libc_hidden_proto for innetgr, rcmd_af, rexec_af, rresvport_af, ruserok_af. * inet/rcmd.c: Add libc_hidden_def. * inet/getnetgrent_r.c: Likewise.
164 lines
4.1 KiB
C
164 lines
4.1 KiB
C
/* Copyright (C) 1991-99,2000,02 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 <stddef.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <sys/wait.h>
|
|
#include <signal.h>
|
|
#include <sys/types.h>
|
|
#include <errno.h>
|
|
|
|
|
|
#ifndef HAVE_GNU_LD
|
|
#define __environ environ
|
|
#endif
|
|
|
|
#define SHELL_PATH "/bin/sh" /* Path of the shell. */
|
|
#define SHELL_NAME "sh" /* Name to give it. */
|
|
|
|
/* Execute LINE as a shell command, returning its status. */
|
|
static int
|
|
do_system (const char *line)
|
|
{
|
|
int status, save;
|
|
pid_t pid;
|
|
struct sigaction sa, intr, quit;
|
|
#ifndef WAITPID_CANNOT_BLOCK_SIGCHLD
|
|
sigset_t block, omask;
|
|
#endif
|
|
|
|
sa.sa_handler = SIG_IGN;
|
|
sa.sa_flags = 0;
|
|
__sigemptyset (&sa.sa_mask);
|
|
|
|
if (__sigaction (SIGINT, &sa, &intr) < 0)
|
|
return -1;
|
|
if (__sigaction (SIGQUIT, &sa, &quit) < 0)
|
|
{
|
|
save = errno;
|
|
(void) __sigaction (SIGINT, &intr, (struct sigaction *) NULL);
|
|
__set_errno (save);
|
|
return -1;
|
|
}
|
|
|
|
#ifndef WAITPID_CANNOT_BLOCK_SIGCHLD
|
|
|
|
/* SCO 3.2v4 has a bug where `waitpid' will never return if SIGCHLD is
|
|
blocked. This makes it impossible for `system' to be implemented in
|
|
compliance with POSIX.2-1992. They have acknowledged that this is a bug
|
|
but I have not seen nor heard of any forthcoming fix. */
|
|
|
|
__sigemptyset (&block);
|
|
__sigaddset (&block, SIGCHLD);
|
|
save = errno;
|
|
if (__sigprocmask (SIG_BLOCK, &block, &omask) < 0)
|
|
{
|
|
if (errno == ENOSYS)
|
|
__set_errno (save);
|
|
else
|
|
{
|
|
save = errno;
|
|
(void) __sigaction (SIGINT, &intr, (struct sigaction *) NULL);
|
|
(void) __sigaction (SIGQUIT, &quit, (struct sigaction *) NULL);
|
|
__set_errno (save);
|
|
return -1;
|
|
}
|
|
}
|
|
# define UNBLOCK __sigprocmask (SIG_SETMASK, &omask, (sigset_t *) NULL)
|
|
#else
|
|
# define UNBLOCK 0
|
|
#endif
|
|
|
|
pid = __fork ();
|
|
if (pid == (pid_t) 0)
|
|
{
|
|
/* Child side. */
|
|
const char *new_argv[4];
|
|
new_argv[0] = SHELL_NAME;
|
|
new_argv[1] = "-c";
|
|
new_argv[2] = line;
|
|
new_argv[3] = NULL;
|
|
|
|
/* Restore the signals. */
|
|
(void) __sigaction (SIGINT, &intr, (struct sigaction *) NULL);
|
|
(void) __sigaction (SIGQUIT, &quit, (struct sigaction *) NULL);
|
|
(void) UNBLOCK;
|
|
|
|
/* Exec the shell. */
|
|
(void) __execve (SHELL_PATH, (char *const *) new_argv, __environ);
|
|
_exit (127);
|
|
}
|
|
else if (pid < (pid_t) 0)
|
|
/* The fork failed. */
|
|
status = -1;
|
|
else
|
|
/* Parent side. */
|
|
{
|
|
#ifdef NO_WAITPID
|
|
pid_t child;
|
|
do
|
|
{
|
|
child = __wait (&status);
|
|
if (child <= -1 && errno != EINTR)
|
|
{
|
|
status = -1;
|
|
break;
|
|
}
|
|
/* Note that pid cannot be <= -1 and therefore the loop continues
|
|
when __wait returned with EINTR. */
|
|
}
|
|
while (child != pid);
|
|
#else
|
|
int n;
|
|
|
|
do
|
|
n = __waitpid (pid, &status, 0);
|
|
while (n == -1 && errno == EINTR);
|
|
|
|
if (n != pid)
|
|
status = -1;
|
|
#endif
|
|
}
|
|
|
|
save = errno;
|
|
if ((__sigaction (SIGINT, &intr, (struct sigaction *) NULL) |
|
|
__sigaction (SIGQUIT, &quit, (struct sigaction *) NULL) |
|
|
UNBLOCK) != 0)
|
|
{
|
|
if (errno == ENOSYS)
|
|
__set_errno (save);
|
|
else
|
|
return -1;
|
|
}
|
|
|
|
return status;
|
|
}
|
|
|
|
int
|
|
__libc_system (const char *line)
|
|
{
|
|
if (line == NULL)
|
|
/* Check that we have a command processor available. It might
|
|
not be available after a chroot(), for example. */
|
|
return do_system ("exit 0") == 0;
|
|
|
|
return do_system (line);
|
|
}
|
|
weak_alias (__libc_system, system)
|