mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
4360eafdd2
1999-06-18 Zack Weinberg <zack@rabi.columbia.edu> * include/features.h: Define new macros __GNUC_PREREQ and __GLIBC_PREREQ which can be used to test the version of gcc and glibc respectively. * assert/assert.h: Use __GNUC_PREREQ. * intl/libintl.h: Likewise. * math/complex.h: Likewise. * math/tgmath.h: Likewise. * misc/sys/cdefs.h: Likewise. * posix/sys/types.h: Likewise. * socket/sys/socket.h: Likewise. * string/bits/string2.h: Likewise. * sysdeps/alpha/fpu/bits/mathinline.h: Likewise. * sysdeps/i386/fpu/bits/mathinline.h: Likewise. 1999-06-18 Zack Weinberg <zack@rabi.columbia.edu> * include/libintl.h: Declare _libc_intl_domainname here. Define _ and N_ here. * include/libc-symbols.h: Don't include <libintl.h>. Don't define _ and N_. Don't declare _libc_intl_domainname. * Makeconfig (CPPFLAGS): Use -imacros to read libc-symbols.h. * db2/config.h: Don't include sys/stat.h or define HAVE_ST_BLKSIZE here... * db2/compat.h: ...do it here. * linuxthreads/internals.h: Include bits/libc-tsd.h after all other headers. * linuxthreads/no-tsd.c: Include sys/cdefs.h for __P. * iconv/iconv.c: Include stddef.h for NULL. * malloc/malloc.h: Include features.h. * sysdeps/generic/morecore.c: Use __malloc_ptr_t not __ptr_t. * sysdeps/unix/make_errlist.c: Write an "#include <libintl.h>" into the generated file. * sysdeps/gnu/errlist.awk: Likewise. * sysdeps/gnu/errlist.c: Rebuilt. * assert/assert-perr.c: Include libintl.h. * assert/assert.c: Likewise. * elf/dl-open.c: Likewise. * elf/dlsym.c: Likewise. * elf/dlvsym.c: Likewise. * iconv/iconv_prog.c: Likewise. * inet/rcmd.c: Likewise. * inet/ruserpass.c: Likewise. * locale/programs/charset.c: Likewise. * locale/programs/ld-collate.c: Likewise. * locale/programs/ld-ctype.c: Likewise. * locale/programs/ld-messages.c: Likewise. * locale/programs/ld-monetary.c: Likewise. * locale/programs/ld-numeric.c: Likewise. * locale/programs/ld-time.c: Likewise. * locale/programs/locfile.c: Likewise. * locale/programs/repertoire.c: Likewise. * login/programs/database.c: Likewise. * login/programs/request.c: Likewise. * malloc/mcheck.c: Likewise. * misc/error.c: Likewise. * nis/nis_call.c: Likewise. * nis/nis_callback.c: Likewise. * nis/nis_error.c: Likewise. * nis/nis_local_names.c: Likewise. * nis/nis_print.c: Likewise. * nis/nis_print_group_entry.c: Likewise. * nis/ypclnt.c: Likewise. * nis/nss_nisplus/nisplus-publickey.c: Likewise. * nscd/cache.c: Likewise. * nscd/connections.c: Likewise. * nscd/grpcache.c: Likewise. * nscd/hstcache.c: Likewise. * nscd/nscd_conf.c: Likewise. * nscd/nscd_stat.c: Likewise. * nscd/pwdcache.c: Likewise. * posix/id.c: Likewise. * resolv/herror.c: Likewise. * stdio-common/psignal.c: Likewise. * string/strsignal.c: Likewise. * sunrpc/auth_unix.c: Likewise. * sunrpc/clnt_perr.c: Likewise. * sunrpc/clnt_raw.c: Likewise. * sunrpc/clnt_tcp.c: Likewise. * sunrpc/clnt_udp.c: Likewise. * sunrpc/clnt_unix.c: Likewise. * sunrpc/get_myaddr.c: Likewise. * sunrpc/pm_getmaps.c: Likewise. * sunrpc/pmap_clnt.c: Likewise. * sunrpc/pmap_rmt.c: Likewise. * sunrpc/rpc_main.c: Likewise. * sunrpc/rpc_scan.c: Likewise. * sunrpc/svc_run.c: Likewise. * sunrpc/svc_simple.c: Likewise. * sunrpc/svc_tcp.c: Likewise. * sunrpc/svc_udp.c: Likewise. * sunrpc/svc_unix.c: Likewise. * sunrpc/xdr_rec.c: Likewise. * sunrpc/xdr_ref.c: Likewise. * sysdeps/mach/hurd/mips/dl-machine.c: Likewise. * sysdeps/posix/gai_strerror.c: Likewise. * sysdeps/unix/siglist.c: Likewise. * sysdeps/unix/sysv/linux/siglist.c: Likewise. * sysdeps/unix/sysv/linux/arm/siglist.c: Likewise. * sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c: Likewise. * timezone/zic.c: Likewise.
254 lines
6.2 KiB
C
254 lines
6.2 KiB
C
/* Error handler for noninteractive utilities
|
||
Copyright (C) 1990,91,92,93,94,95,96,97,98 Free Software Foundation, Inc.
|
||
|
||
This file is part of the GNU C Library. Its master source is NOT part of
|
||
the C library, however. The master source lives in /gd/gnu/lib.
|
||
|
||
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., 59 Temple Place - Suite 330,
|
||
Boston, MA 02111-1307, USA. */
|
||
|
||
/* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
|
||
|
||
#ifdef HAVE_CONFIG_H
|
||
# include <config.h>
|
||
#endif
|
||
|
||
#include <stdio.h>
|
||
#include <libintl.h>
|
||
|
||
#if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC
|
||
# if __STDC__
|
||
# include <stdarg.h>
|
||
# define VA_START(args, lastarg) va_start(args, lastarg)
|
||
# else
|
||
# include <varargs.h>
|
||
# define VA_START(args, lastarg) va_start(args)
|
||
# endif
|
||
#else
|
||
# define va_alist a1, a2, a3, a4, a5, a6, a7, a8
|
||
# define va_dcl char *a1, *a2, *a3, *a4, *a5, *a6, *a7, *a8;
|
||
#endif
|
||
|
||
#if STDC_HEADERS || _LIBC
|
||
# include <stdlib.h>
|
||
# include <string.h>
|
||
#else
|
||
void exit ();
|
||
#endif
|
||
|
||
#include "error.h"
|
||
|
||
#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) (
|
||
#if __STDC__ - 0
|
||
void
|
||
#endif
|
||
);
|
||
|
||
/* 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>
|
||
|
||
/* In GNU libc we want do not want to use the common name `error' directly.
|
||
Instead make it a weak alias. */
|
||
# define error __error
|
||
# define error_at_line __error_at_line
|
||
|
||
# ifdef USE_IN_LIBIO
|
||
# include <libio/iolibio.h>
|
||
# define fflush(s) _IO_fflush (s)
|
||
# endif
|
||
|
||
#else /* not _LIBC */
|
||
|
||
/* The calling program should define program_name and set it to the
|
||
name of the executing program. */
|
||
extern char *program_name;
|
||
|
||
# ifdef HAVE_STRERROR_R
|
||
# define __strerror_r strerror_r
|
||
# else
|
||
# if HAVE_STRERROR
|
||
# ifndef strerror /* On some systems, strerror is a macro */
|
||
char *strerror ();
|
||
# endif
|
||
# else
|
||
static char *
|
||
private_strerror (errnum)
|
||
int errnum;
|
||
{
|
||
extern char *sys_errlist[];
|
||
extern int sys_nerr;
|
||
|
||
if (errnum > 0 && errnum <= sys_nerr)
|
||
return _(sys_errlist[errnum]);
|
||
return _("Unknown system error");
|
||
}
|
||
# define strerror private_strerror
|
||
# endif /* HAVE_STRERROR */
|
||
# endif /* HAVE_STRERROR_R */
|
||
#endif /* not _LIBC */
|
||
|
||
/* 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. */
|
||
/* VARARGS */
|
||
|
||
void
|
||
#if defined VA_START && __STDC__
|
||
error (int status, int errnum, const char *message, ...)
|
||
#else
|
||
error (status, errnum, message, va_alist)
|
||
int status;
|
||
int errnum;
|
||
char *message;
|
||
va_dcl
|
||
#endif
|
||
{
|
||
#ifdef VA_START
|
||
va_list args;
|
||
#endif
|
||
|
||
if (error_print_progname)
|
||
(*error_print_progname) ();
|
||
else
|
||
{
|
||
fflush (stdout);
|
||
fprintf (stderr, "%s: ", program_name);
|
||
}
|
||
|
||
#ifdef VA_START
|
||
VA_START (args, message);
|
||
# if HAVE_VPRINTF || _LIBC
|
||
vfprintf (stderr, message, args);
|
||
# else
|
||
_doprnt (message, args, stderr);
|
||
# endif
|
||
va_end (args);
|
||
#else
|
||
fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8);
|
||
#endif
|
||
|
||
++error_message_count;
|
||
if (errnum)
|
||
{
|
||
#if defined HAVE_STRERROR_R || defined _LIBC
|
||
char errbuf[1024];
|
||
fprintf (stderr, ": %s", __strerror_r (errnum, errbuf, sizeof errbuf));
|
||
#else
|
||
fprintf (stderr, ": %s", strerror (errnum));
|
||
#endif
|
||
}
|
||
putc ('\n', stderr);
|
||
fflush (stderr);
|
||
if (status)
|
||
exit (status);
|
||
}
|
||
|
||
/* 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
|
||
#if defined VA_START && __STDC__
|
||
error_at_line (int status, int errnum, const char *file_name,
|
||
unsigned int line_number, const char *message, ...)
|
||
#else
|
||
error_at_line (status, errnum, file_name, line_number, message, va_alist)
|
||
int status;
|
||
int errnum;
|
||
const char *file_name;
|
||
unsigned int line_number;
|
||
char *message;
|
||
va_dcl
|
||
#endif
|
||
{
|
||
#ifdef VA_START
|
||
va_list args;
|
||
#endif
|
||
|
||
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 || !strcmp (old_file_name, file_name)))
|
||
/* Simply return and print nothing. */
|
||
return;
|
||
|
||
old_file_name = file_name;
|
||
old_line_number = line_number;
|
||
}
|
||
|
||
if (error_print_progname)
|
||
(*error_print_progname) ();
|
||
else
|
||
{
|
||
fflush (stdout);
|
||
fprintf (stderr, "%s:", program_name);
|
||
}
|
||
|
||
if (file_name != NULL)
|
||
fprintf (stderr, "%s:%d: ", file_name, line_number);
|
||
|
||
#ifdef VA_START
|
||
VA_START (args, message);
|
||
# if HAVE_VPRINTF || _LIBC
|
||
vfprintf (stderr, message, args);
|
||
# else
|
||
_doprnt (message, args, stderr);
|
||
# endif
|
||
va_end (args);
|
||
#else
|
||
fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8);
|
||
#endif
|
||
|
||
++error_message_count;
|
||
if (errnum)
|
||
{
|
||
#if defined HAVE_STRERROR_R || defined _LIBC
|
||
char errbuf[1024];
|
||
fprintf (stderr, ": %s", __strerror_r (errnum, errbuf, sizeof errbuf));
|
||
#else
|
||
fprintf (stderr, ": %s", strerror (errnum));
|
||
#endif
|
||
}
|
||
putc ('\n', stderr);
|
||
fflush (stderr);
|
||
if (status)
|
||
exit (status);
|
||
}
|
||
|
||
#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
|