mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-24 18:23:41 +08:00
c44a663dca
2001-04-05 David S. Miller <davem@redhat.com> Add hp-timing support for sparcv9/sparc64 targets. * sysdeps/sparc/sparc32/sparcv9/hp-timing.c: New file * sysdeps/sparc/sparc32/sparcv9/hp-timing.h: New file * sysdeps/sparc/sparc64/hp-timing.c: New file * sysdeps/sparc/sparc64/hp-timing.h: New file * sysdeps/sparc/sparc32/sparcv9/Makefile: Build hp-timing. * sysdeps/sparc/sparc64/Makefile: Likewise. 2001-04-09 Jakub Jelinek <jakub@redhat.com> * sysdeps/generic/fd_to_filename.h: New file. * sysdeps/unix/sysv/linux/fd_to_filename.h: New file. * libio/freopen.c (freopen): If FILENAME is NULL, try to get filename from the open file descriptor. * libio/freopen64.c (freopen64): Likewise. 2001-04-09 Bruno Haible <haible@clisp.cons.org> * misc/error.c (error): fflush stdout also if error_print_progname != NULL. (error_at_line): Likewise. 2001-04-07 Bruno Haible <haible@clisp.cons.org> * intl/gettextP.h (struct loaded_domain): Add codeset_cntr field. (struct binding): Add codeset_cntr field. (_nl_load_domain): Add domainbinding argument. (_nl_init_domain_conv, _nl_free_domain_conv): New declarations. (_nl_find_msg): New declaration, moved here from loadinfo.h. * intl/loadinfo.h (struct loaded_l10nfile): Remove domainbinding field. (_nl_make_l10nflist): Remove domainbinding argument. (_nl_find_msg): Move declaration to gettextP.h. * intl/bindtextdom.c (set_binding_values): Initialize ->codeset_cntr to 0. Increment it when ->codeset is changed. * intl/dcigettext.c (DCIGETTEXT): Pass binding to _nl_find_msg. (_nl_find_msg): Add domainbinding argument. Reinitialize the converter if domainbinding->codeset_cntr has been incremented. * intl/finddomain.c (_nl_find_domain): Don't pass domainbinding to _nl_make_l10nflist(). Pass it to _nl_load_domain() instead. * intl/l10nflist.c (_nl_make_l10nflist): Remove domainbinding argument. * intl/loadmsgcat.c (_nl_init_domain_conv): New function, extracted from _nl_load_domain. Append //TRANSLIT also when using libiconv. (_nl_free_domain_conv): New function, extracted from _nl_unload_domain. (_nl_load_domain): Add domainbinding argument. Call _nl_init_domain_conv. (_nl_unload_domain): Call _nl_free_domain_conv. * intl/Makefile (distribute): Add tst-codeset.sh, tstcodeset.po. (test-srcs): Add tst-codeset. (tests): Depend on tst-codeset.out. (tst-codeset.out): New rule. (CFLAGS-tst-codeset.c): New variable. * intl/tst-codeset.sh: New file. * intl/tstcodeset.po: New file. * intl/tst-codeset.c: New file. * locale/findlocale.c (_nl_find_locale): Update _nl_make_l10nflist calls.
256 lines
6.4 KiB
C
256 lines
6.4 KiB
C
/* Error handler for noninteractive utilities
|
||
Copyright (C) 1990-1998, 2000, 2001 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. */
|
||
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
|
||
|
||
# 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
|
||
|
||
fflush (stdout);
|
||
if (error_print_progname)
|
||
(*error_print_progname) ();
|
||
else
|
||
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 || _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;
|
||
}
|
||
|
||
fflush (stdout);
|
||
if (error_print_progname)
|
||
(*error_print_progname) ();
|
||
else
|
||
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 || _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
|