mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-04 02:40:06 +00:00
ec999b8e5e
It was noted in <https://sourceware.org/ml/libc-alpha/2012-09/msg00305.html> that the bits/*.h naming scheme should only be used for installed headers. This patch renames bits/libc-lock.h to plain libc-lock.h and bits/libc-lockP.h to plain libc-lockP.h to follow that convention. Note that I don't know where libc-lockP.h comes from for Hurd (the Hurd libc-lock.h includes libc-lockP.h, but the only libc-lockP.h in the glibc source tree is for NPTL) - some unmerged patch? - but I updated the #include in the Hurd libc-lock.h anyway. Tested for x86_64 (testsuite, and that installed stripped shared libraries are unchanged by the patch). [BZ #14912] * bits/libc-lock.h: Move to ... * sysdeps/generic/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. * sysdeps/mach/hurd/bits/libc-lock.h: Move to ... * sysdeps/mach/hurd/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. [_LIBC]: Include <libc-lockP.h> instead of <bits/libc-lockP.h>. * sysdeps/mach/bits/libc-lock.h: Move to ... * sysdeps/mach/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. * sysdeps/nptl/bits/libc-lock.h: Move to ... * sysdeps/nptl/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. * sysdeps/nptl/bits/libc-lockP.h: Move to ... * sysdeps/nptl/libc-lockP.h: ...here. (_BITS_LIBC_LOCKP_H): Rename macro to _LIBC_LOCKP_H. * crypt/crypt_util.c: Include <libc-lock.h> instead of <bits/libc-lock.h>. * dirent/scandir-tail.c: Likewise. * dlfcn/dlerror.c: Likewise. * elf/dl-close.c: Likewise. * elf/dl-iteratephdr.c: Likewise. * elf/dl-lookup.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-support.c: Likewise. * elf/dl-writev.h: Likewise. * elf/rtld.c: Likewise. * grp/fgetgrent.c: Likewise. * gshadow/fgetsgent.c: Likewise. * gshadow/sgetsgent.c: Likewise. * iconv/gconv_conf.c: Likewise. * iconv/gconv_db.c: Likewise. * iconv/gconv_dl.c: Likewise. * iconv/gconv_int.h: Likewise. * iconv/gconv_trans.c: Likewise. * include/link.h: Likewise. * inet/getnameinfo.c: Likewise. * inet/getnetgrent.c: Likewise. * inet/getnetgrent_r.c: Likewise. * intl/bindtextdom.c: Likewise. * intl/dcigettext.c: Likewise. * intl/finddomain.c: Likewise. * intl/gettextP.h: Likewise. * intl/loadmsgcat.c: Likewise. * intl/localealias.c: Likewise. * intl/textdomain.c: Likewise. * libidn/idn-stub.c: Likewise. * libio/libioP.h: Likewise. * locale/duplocale.c: Likewise. * locale/freelocale.c: Likewise. * locale/newlocale.c: Likewise. * locale/setlocale.c: Likewise. * login/getutent_r.c: Likewise. * login/getutid_r.c: Likewise. * login/getutline_r.c: Likewise. * login/utmp-private.h: Likewise. * login/utmpname.c: Likewise. * malloc/mtrace.c: Likewise. * misc/efgcvt.c: Likewise. * misc/error.c: Likewise. * misc/fstab.c: Likewise. * misc/getpass.c: Likewise. * misc/mntent.c: Likewise. * misc/syslog.c: Likewise. * nis/nis_call.c: Likewise. * nis/nis_callback.c: Likewise. * nis/nss-default.c: Likewise. * nis/nss_compat/compat-grp.c: Likewise. * nis/nss_compat/compat-initgroups.c: Likewise. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nis/nss_nis/nis-alias.c: Likewise. * nis/nss_nis/nis-ethers.c: Likewise. * nis/nss_nis/nis-grp.c: Likewise. * nis/nss_nis/nis-hosts.c: Likewise. * nis/nss_nis/nis-network.c: Likewise. * nis/nss_nis/nis-proto.c: Likewise. * nis/nss_nis/nis-pwd.c: Likewise. * nis/nss_nis/nis-rpc.c: Likewise. * nis/nss_nis/nis-service.c: Likewise. * nis/nss_nis/nis-spwd.c: Likewise. * nis/nss_nisplus/nisplus-alias.c: Likewise. * nis/nss_nisplus/nisplus-ethers.c: Likewise. * nis/nss_nisplus/nisplus-grp.c: Likewise. * nis/nss_nisplus/nisplus-hosts.c: Likewise. * nis/nss_nisplus/nisplus-initgroups.c: Likewise. * nis/nss_nisplus/nisplus-network.c: Likewise. * nis/nss_nisplus/nisplus-proto.c: Likewise. * nis/nss_nisplus/nisplus-pwd.c: Likewise. * nis/nss_nisplus/nisplus-rpc.c: Likewise. * nis/nss_nisplus/nisplus-service.c: Likewise. * nis/nss_nisplus/nisplus-spwd.c: Likewise. * nis/ypclnt.c: Likewise. * nptl/libc_pthread_init.c: Likewise. * nss/getXXbyYY.c: Likewise. * nss/getXXent.c: Likewise. * nss/getXXent_r.c: Likewise. * nss/nss_db/db-XXX.c: Likewise. * nss/nss_db/db-netgrp.c: Likewise. * nss/nss_db/nss_db.h: Likewise. * nss/nss_files/files-XXX.c: Likewise. * nss/nss_files/files-alias.c: Likewise. * nss/nsswitch.c: Likewise. * posix/regex_internal.h: Likewise. * posix/wordexp.c: Likewise. * pwd/fgetpwent.c: Likewise. * resolv/res_hconf.c: Likewise. * resolv/res_libc.c: Likewise. * shadow/fgetspent.c: Likewise. * shadow/lckpwdf.c: Likewise. * shadow/sgetspent.c: Likewise. * socket/opensock.c: Likewise. * stdio-common/reg-modifier.c: Likewise. * stdio-common/reg-printf.c: Likewise. * stdio-common/reg-type.c: Likewise. * stdio-common/vfprintf.c: Likewise. * stdio-common/vfscanf.c: Likewise. * stdlib/abort.c: Likewise. * stdlib/cxa_atexit.c: Likewise. * stdlib/fmtmsg.c: Likewise. * stdlib/random.c: Likewise. * stdlib/setenv.c: Likewise. * string/strsignal.c: Likewise. * sunrpc/auth_none.c: Likewise. * sunrpc/bindrsvprt.c: Likewise. * sunrpc/create_xid.c: Likewise. * sunrpc/key_call.c: Likewise. * sunrpc/rpc_thread.c: Likewise. * sysdeps/arm/backtrace.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/generic/stdio-lock.h: Likewise. * sysdeps/generic/unwind-dw2-fde.c: Likewise. * sysdeps/i386/backtrace.c: Likewise. * sysdeps/ieee754/ldbl-opt/nldbl-compat.c: Likewise. * sysdeps/m68k/backtrace.c: Likewise. * sysdeps/mach/hurd/cthreads.c: Likewise. * sysdeps/mach/hurd/dirstream.h: Likewise. * sysdeps/mach/hurd/malloc-machine.h: Likewise. * sysdeps/nptl/malloc-machine.h: Likewise. * sysdeps/nptl/stdio-lock.h: Likewise. * sysdeps/posix/dirstream.h: Likewise. * sysdeps/posix/getaddrinfo.c: Likewise. * sysdeps/posix/system.c: Likewise. * sysdeps/pthread/aio_suspend.c: Likewise. * sysdeps/s390/s390-32/backtrace.c: Likewise. * sysdeps/s390/s390-64/backtrace.c: Likewise. * sysdeps/unix/sysv/linux/check_pf.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getutent_r.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getutid_r.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getutline_r.c: Likewise. * sysdeps/unix/sysv/linux/shm-directory.c: Likewise. * sysdeps/unix/sysv/linux/system.c: Likewise. * sysdeps/x86_64/backtrace.c: Likewise. * time/alt_digit.c: Likewise. * time/era.c: Likewise. * time/tzset.c: Likewise. * wcsmbs/wcsmbsload.c: Likewise. * nptl/tst-initializers1.c (do_test): Refer to <libc-lock.h> instead of <bits/libc-lock.h> in comment.
187 lines
4.5 KiB
C
187 lines
4.5 KiB
C
/* Copyright (C) 1991-2015 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, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <errno.h>
|
|
#include <signal.h>
|
|
#include <stddef.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <sys/types.h>
|
|
#include <sys/wait.h>
|
|
#include <libc-lock.h>
|
|
#include <sysdep-cancel.h>
|
|
|
|
|
|
#define SHELL_PATH "/bin/sh" /* Path of the shell. */
|
|
#define SHELL_NAME "sh" /* Name to give it. */
|
|
|
|
|
|
#ifdef _LIBC_REENTRANT
|
|
static struct sigaction intr, quit;
|
|
static int sa_refcntr;
|
|
__libc_lock_define_initialized (static, lock);
|
|
|
|
# define DO_LOCK() __libc_lock_lock (lock)
|
|
# define DO_UNLOCK() __libc_lock_unlock (lock)
|
|
# define INIT_LOCK() ({ __libc_lock_init (lock); sa_refcntr = 0; })
|
|
# define ADD_REF() sa_refcntr++
|
|
# define SUB_REF() --sa_refcntr
|
|
#else
|
|
# define DO_LOCK()
|
|
# define DO_UNLOCK()
|
|
# define INIT_LOCK()
|
|
# define ADD_REF() 0
|
|
# define SUB_REF() 0
|
|
#endif
|
|
|
|
|
|
/* 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;
|
|
#ifndef _LIBC_REENTRANT
|
|
struct sigaction intr, quit;
|
|
#endif
|
|
sigset_t omask;
|
|
|
|
sa.sa_handler = SIG_IGN;
|
|
sa.sa_flags = 0;
|
|
__sigemptyset (&sa.sa_mask);
|
|
|
|
DO_LOCK ();
|
|
if (ADD_REF () == 0)
|
|
{
|
|
if (__sigaction (SIGINT, &sa, &intr) < 0)
|
|
{
|
|
(void) SUB_REF ();
|
|
goto out;
|
|
}
|
|
if (__sigaction (SIGQUIT, &sa, &quit) < 0)
|
|
{
|
|
save = errno;
|
|
(void) SUB_REF ();
|
|
goto out_restore_sigint;
|
|
}
|
|
}
|
|
DO_UNLOCK ();
|
|
|
|
/* We reuse the bitmap in the 'sa' structure. */
|
|
__sigaddset (&sa.sa_mask, SIGCHLD);
|
|
save = errno;
|
|
if (__sigprocmask (SIG_BLOCK, &sa.sa_mask, &omask) < 0)
|
|
{
|
|
#ifndef _LIBC
|
|
if (errno == ENOSYS)
|
|
__set_errno (save);
|
|
else
|
|
#endif
|
|
{
|
|
DO_LOCK ();
|
|
if (SUB_REF () == 0)
|
|
{
|
|
save = errno;
|
|
(void) __sigaction (SIGQUIT, &quit, (struct sigaction *) NULL);
|
|
out_restore_sigint:
|
|
(void) __sigaction (SIGINT, &intr, (struct sigaction *) NULL);
|
|
__set_errno (save);
|
|
}
|
|
out:
|
|
DO_UNLOCK ();
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
#ifdef CLEANUP_HANDLER
|
|
CLEANUP_HANDLER;
|
|
#endif
|
|
|
|
#ifdef FORK
|
|
pid = FORK ();
|
|
#else
|
|
pid = __fork ();
|
|
#endif
|
|
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) __sigprocmask (SIG_SETMASK, &omask, (sigset_t *) NULL);
|
|
INIT_LOCK ();
|
|
|
|
/* 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. */
|
|
{
|
|
/* Note the system() is a cancellation point. But since we call
|
|
waitpid() which itself is a cancellation point we do not
|
|
have to do anything here. */
|
|
if (TEMP_FAILURE_RETRY (__waitpid (pid, &status, 0)) != pid)
|
|
status = -1;
|
|
}
|
|
|
|
#ifdef CLEANUP_HANDLER
|
|
CLEANUP_RESET;
|
|
#endif
|
|
|
|
save = errno;
|
|
DO_LOCK ();
|
|
if ((SUB_REF () == 0
|
|
&& (__sigaction (SIGINT, &intr, (struct sigaction *) NULL)
|
|
| __sigaction (SIGQUIT, &quit, (struct sigaction *) NULL)) != 0)
|
|
|| __sigprocmask (SIG_SETMASK, &omask, (sigset_t *) NULL) != 0)
|
|
{
|
|
#ifndef _LIBC
|
|
/* glibc cannot be used on systems without waitpid. */
|
|
if (errno == ENOSYS)
|
|
__set_errno (save);
|
|
else
|
|
#endif
|
|
status = -1;
|
|
}
|
|
DO_UNLOCK ();
|
|
|
|
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)
|