mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08: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.
408 lines
9.8 KiB
C
408 lines
9.8 KiB
C
/* Error handler for noninteractive utilities
|
||
Copyright (C) 1990-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/>. */
|
||
|
||
/* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
|
||
|
||
#if !_LIBC
|
||
# include <config.h>
|
||
#endif
|
||
|
||
#include "error.h"
|
||
|
||
#include <stdarg.h>
|
||
#include <stdio.h>
|
||
#include <stdlib.h>
|
||
#include <string.h>
|
||
|
||
#if !_LIBC && ENABLE_NLS
|
||
# include "gettext.h"
|
||
# define _(msgid) gettext (msgid)
|
||
#endif
|
||
|
||
#ifdef _LIBC
|
||
# include <libintl.h>
|
||
# include <stdbool.h>
|
||
# include <stdint.h>
|
||
# include <wchar.h>
|
||
# define mbsrtowcs __mbsrtowcs
|
||
# define USE_UNLOCKED_IO 0
|
||
# define _GL_ATTRIBUTE_FORMAT_PRINTF(a, b)
|
||
# define _GL_ARG_NONNULL(a)
|
||
#endif
|
||
|
||
#if USE_UNLOCKED_IO
|
||
# include "unlocked-io.h"
|
||
#endif
|
||
|
||
#ifndef _
|
||
# define _(String) String
|
||
#endif
|
||
|
||
/* If NULL, error will flush stdout, then print on stderr the program
|
||
name, a colon and a space. Otherwise, error will call this
|
||
function without parameters instead. */
|
||
void (*error_print_progname) (void);
|
||
|
||
/* This variable is incremented each time 'error' is called. */
|
||
unsigned int error_message_count;
|
||
|
||
#ifdef _LIBC
|
||
/* In the GNU C library, there is a predefined variable for this. */
|
||
|
||
# define program_name program_invocation_name
|
||
# include <errno.h>
|
||
# include <limits.h>
|
||
# include <libio/libioP.h>
|
||
|
||
/* In GNU libc we want do not want to use the common name 'error' directly.
|
||
Instead make it a weak alias. */
|
||
extern void __error (int status, int errnum, const char *message, ...)
|
||
__attribute__ ((__format__ (__printf__, 3, 4)));
|
||
extern void __error_at_line (int status, int errnum, const char *file_name,
|
||
unsigned int line_number, const char *message,
|
||
...)
|
||
__attribute__ ((__format__ (__printf__, 5, 6)));;
|
||
# define error __error
|
||
# define error_at_line __error_at_line
|
||
|
||
# include <libio/iolibio.h>
|
||
# define fflush(s) _IO_fflush (s)
|
||
# undef putc
|
||
# define putc(c, fp) _IO_putc (c, fp)
|
||
|
||
# include <libc-lock.h>
|
||
|
||
#else /* not _LIBC */
|
||
|
||
# include <fcntl.h>
|
||
# include <unistd.h>
|
||
|
||
# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
|
||
/* Get declarations of the native Windows API functions. */
|
||
# define WIN32_LEAN_AND_MEAN
|
||
# include <windows.h>
|
||
/* Get _get_osfhandle. */
|
||
# include "msvc-nothrow.h"
|
||
# endif
|
||
|
||
/* The gnulib override of fcntl is not needed in this file. */
|
||
# undef fcntl
|
||
|
||
# if !HAVE_DECL_STRERROR_R
|
||
# ifndef HAVE_DECL_STRERROR_R
|
||
"this configure-time declaration test was not run"
|
||
# endif
|
||
# if STRERROR_R_CHAR_P
|
||
char *strerror_r ();
|
||
# else
|
||
int strerror_r ();
|
||
# endif
|
||
# endif
|
||
|
||
/* The calling program should define program_name and set it to the
|
||
name of the executing program. */
|
||
extern char *program_name;
|
||
|
||
# if HAVE_STRERROR_R || defined strerror_r
|
||
# define __strerror_r strerror_r
|
||
# endif /* HAVE_STRERROR_R || defined strerror_r */
|
||
#endif /* not _LIBC */
|
||
|
||
#if !_LIBC
|
||
/* Return non-zero if FD is open. */
|
||
static int
|
||
is_open (int fd)
|
||
{
|
||
# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
|
||
/* On native Windows: The initial state of unassigned standard file
|
||
descriptors is that they are open but point to an INVALID_HANDLE_VALUE.
|
||
There is no fcntl, and the gnulib replacement fcntl does not support
|
||
F_GETFL. */
|
||
return (HANDLE) _get_osfhandle (fd) != INVALID_HANDLE_VALUE;
|
||
# else
|
||
# ifndef F_GETFL
|
||
# error Please port fcntl to your platform
|
||
# endif
|
||
return 0 <= fcntl (fd, F_GETFL);
|
||
# endif
|
||
}
|
||
#endif
|
||
|
||
static void
|
||
flush_stdout (void)
|
||
{
|
||
#if !_LIBC
|
||
int stdout_fd;
|
||
|
||
# if GNULIB_FREOPEN_SAFER
|
||
/* Use of gnulib's freopen-safer module normally ensures that
|
||
fileno (stdout) == 1
|
||
whenever stdout is open. */
|
||
stdout_fd = STDOUT_FILENO;
|
||
# else
|
||
/* POSIX states that fileno (stdout) after fclose is unspecified. But in
|
||
practice it is not a problem, because stdout is statically allocated and
|
||
the fd of a FILE stream is stored as a field in its allocated memory. */
|
||
stdout_fd = fileno (stdout);
|
||
# endif
|
||
/* POSIX states that fflush (stdout) after fclose is unspecified; it
|
||
is safe in glibc, but not on all other platforms. fflush (NULL)
|
||
is always defined, but too draconian. */
|
||
if (0 <= stdout_fd && is_open (stdout_fd))
|
||
#endif
|
||
fflush (stdout);
|
||
}
|
||
|
||
static void
|
||
print_errno_message (int errnum)
|
||
{
|
||
char const *s;
|
||
|
||
#if defined HAVE_STRERROR_R || _LIBC
|
||
char errbuf[1024];
|
||
# if _LIBC || STRERROR_R_CHAR_P
|
||
s = __strerror_r (errnum, errbuf, sizeof errbuf);
|
||
# else
|
||
if (__strerror_r (errnum, errbuf, sizeof errbuf) == 0)
|
||
s = errbuf;
|
||
else
|
||
s = 0;
|
||
# endif
|
||
#else
|
||
s = strerror (errnum);
|
||
#endif
|
||
|
||
#if !_LIBC
|
||
if (! s)
|
||
s = _("Unknown system error");
|
||
#endif
|
||
|
||
#if _LIBC
|
||
__fxprintf (NULL, ": %s", s);
|
||
#else
|
||
fprintf (stderr, ": %s", s);
|
||
#endif
|
||
}
|
||
|
||
static void _GL_ATTRIBUTE_FORMAT_PRINTF (3, 0) _GL_ARG_NONNULL ((3))
|
||
error_tail (int status, int errnum, const char *message, va_list args)
|
||
{
|
||
#if _LIBC
|
||
if (_IO_fwide (stderr, 0) > 0)
|
||
{
|
||
size_t len = strlen (message) + 1;
|
||
wchar_t *wmessage = NULL;
|
||
mbstate_t st;
|
||
size_t res;
|
||
const char *tmp;
|
||
bool use_malloc = false;
|
||
|
||
while (1)
|
||
{
|
||
if (__libc_use_alloca (len * sizeof (wchar_t)))
|
||
wmessage = (wchar_t *) alloca (len * sizeof (wchar_t));
|
||
else
|
||
{
|
||
if (!use_malloc)
|
||
wmessage = NULL;
|
||
|
||
wchar_t *p = (wchar_t *) realloc (wmessage,
|
||
len * sizeof (wchar_t));
|
||
if (p == NULL)
|
||
{
|
||
free (wmessage);
|
||
fputws_unlocked (L"out of memory\n", stderr);
|
||
return;
|
||
}
|
||
wmessage = p;
|
||
use_malloc = true;
|
||
}
|
||
|
||
memset (&st, '\0', sizeof (st));
|
||
tmp = message;
|
||
|
||
res = mbsrtowcs (wmessage, &tmp, len, &st);
|
||
if (res != len)
|
||
break;
|
||
|
||
if (__builtin_expect (len >= SIZE_MAX / sizeof (wchar_t) / 2, 0))
|
||
{
|
||
/* This really should not happen if everything is fine. */
|
||
res = (size_t) -1;
|
||
break;
|
||
}
|
||
|
||
len *= 2;
|
||
}
|
||
|
||
if (res == (size_t) -1)
|
||
{
|
||
/* The string cannot be converted. */
|
||
if (use_malloc)
|
||
{
|
||
free (wmessage);
|
||
use_malloc = false;
|
||
}
|
||
wmessage = (wchar_t *) L"???";
|
||
}
|
||
|
||
__vfwprintf (stderr, wmessage, args);
|
||
|
||
if (use_malloc)
|
||
free (wmessage);
|
||
}
|
||
else
|
||
#endif
|
||
vfprintf (stderr, message, args);
|
||
va_end (args);
|
||
|
||
++error_message_count;
|
||
if (errnum)
|
||
print_errno_message (errnum);
|
||
#if _LIBC
|
||
__fxprintf (NULL, "\n");
|
||
#else
|
||
putc ('\n', stderr);
|
||
#endif
|
||
fflush (stderr);
|
||
if (status)
|
||
exit (status);
|
||
}
|
||
|
||
|
||
/* Print the program name and error message MESSAGE, which is a printf-style
|
||
format string with optional args.
|
||
If ERRNUM is nonzero, print its corresponding system error message.
|
||
Exit with status STATUS if it is nonzero. */
|
||
void
|
||
error (int status, int errnum, const char *message, ...)
|
||
{
|
||
va_list args;
|
||
|
||
#if defined _LIBC && defined __libc_ptf_call
|
||
/* We do not want this call to be cut short by a thread
|
||
cancellation. Therefore disable cancellation for now. */
|
||
int state = PTHREAD_CANCEL_ENABLE;
|
||
__libc_ptf_call (pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, &state),
|
||
0);
|
||
#endif
|
||
|
||
flush_stdout ();
|
||
#ifdef _LIBC
|
||
_IO_flockfile (stderr);
|
||
#endif
|
||
if (error_print_progname)
|
||
(*error_print_progname) ();
|
||
else
|
||
{
|
||
#if _LIBC
|
||
__fxprintf (NULL, "%s: ", program_name);
|
||
#else
|
||
fprintf (stderr, "%s: ", program_name);
|
||
#endif
|
||
}
|
||
|
||
va_start (args, message);
|
||
error_tail (status, errnum, message, args);
|
||
|
||
#ifdef _LIBC
|
||
_IO_funlockfile (stderr);
|
||
# ifdef __libc_ptf_call
|
||
__libc_ptf_call (pthread_setcancelstate, (state, NULL), 0);
|
||
# endif
|
||
#endif
|
||
}
|
||
|
||
/* Sometimes we want to have at most one error per line. This
|
||
variable controls whether this mode is selected or not. */
|
||
int error_one_per_line;
|
||
|
||
void
|
||
error_at_line (int status, int errnum, const char *file_name,
|
||
unsigned int line_number, const char *message, ...)
|
||
{
|
||
va_list args;
|
||
|
||
if (error_one_per_line)
|
||
{
|
||
static const char *old_file_name;
|
||
static unsigned int old_line_number;
|
||
|
||
if (old_line_number == line_number
|
||
&& (file_name == old_file_name
|
||
|| (old_file_name != NULL
|
||
&& file_name != NULL
|
||
&& strcmp (old_file_name, file_name) == 0)))
|
||
|
||
/* Simply return and print nothing. */
|
||
return;
|
||
|
||
old_file_name = file_name;
|
||
old_line_number = line_number;
|
||
}
|
||
|
||
#if defined _LIBC && defined __libc_ptf_call
|
||
/* We do not want this call to be cut short by a thread
|
||
cancellation. Therefore disable cancellation for now. */
|
||
int state = PTHREAD_CANCEL_ENABLE;
|
||
__libc_ptf_call (pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, &state),
|
||
0);
|
||
#endif
|
||
|
||
flush_stdout ();
|
||
#ifdef _LIBC
|
||
_IO_flockfile (stderr);
|
||
#endif
|
||
if (error_print_progname)
|
||
(*error_print_progname) ();
|
||
else
|
||
{
|
||
#if _LIBC
|
||
__fxprintf (NULL, "%s:", program_name);
|
||
#else
|
||
fprintf (stderr, "%s:", program_name);
|
||
#endif
|
||
}
|
||
|
||
#if _LIBC
|
||
__fxprintf (NULL, file_name != NULL ? "%s:%d: " : " ",
|
||
file_name, line_number);
|
||
#else
|
||
fprintf (stderr, file_name != NULL ? "%s:%d: " : " ",
|
||
file_name, line_number);
|
||
#endif
|
||
|
||
va_start (args, message);
|
||
error_tail (status, errnum, message, args);
|
||
|
||
#ifdef _LIBC
|
||
_IO_funlockfile (stderr);
|
||
# ifdef __libc_ptf_call
|
||
__libc_ptf_call (pthread_setcancelstate, (state, NULL), 0);
|
||
# endif
|
||
#endif
|
||
}
|
||
|
||
#ifdef _LIBC
|
||
/* Make the weak alias. */
|
||
# undef error
|
||
# undef error_at_line
|
||
weak_alias (__error, error)
|
||
weak_alias (__error_at_line, error_at_line)
|
||
#endif
|