mirror of
https://sourceware.org/git/glibc.git
synced 2025-08-07 06:43:00 +03:00
Update.
1998-03-27 22:46 Ulrich Drepper <drepper@cygnus.com> * Rules: Allow Makefiles to specify test-static for tests which cannot be linked dynamically. * math/Makefile: Move atest-exp, atest-sincos, atest-exp2 to tests-static. * libc.map: Add __nss_passwd_lookup, __nss_group_lookup, __nss_next. * misc/error.c: Pretty print. 1998-03-27 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makerules (libc_nonshared-name): Remove variable. (installed-libcs): Use libc-name instead. ($(inst_libdir)/libc.so): Likewise. Remove explicit reference to dynamic linker. * Makeconfig (link-libc): Link against libc_nonshared.a instead of libc.a. Remove explicit reference to dynamic linker. 1998-03-27 Ulrich Drepper <drepper@cygnus.com> * iconvdata/iso8859-1.c (gconv): Add cast to assignment from char to wchar_t. * iconv/iconv_prog.c: Correctly test for write failure. * iconvdata/Makefile: Add rules for EUC-KR, UHC, and JOHAB conversions. * iconvdata/gconv-modules: Likewise. * iconvdata/euckr.c: New file. * iconvdata/johab.c: New file. * iconvdata/ksc5601.c: New file. * iconvdata/ksc5601.h: New file. * iconvdata/uhc.c: New file. Contributed by Jungshik Shin <jshin@pantheon.yale.edu>. * libio/fileops.c (_IO_file_fopen): Interpret x flag to fopen. * stdio/fopen.c: Correct handling of 'x' flag. Reported by Jason M. Petry <jason@ps.ohio-state.edu>. 1998-03-27 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sunrpc/rpc/key_prot.h: Prevent warning by unknown pragma ident. * sunrpc/rpcsvc/key_prot.x: Likewise. * sunrpc/key_prot.c: Likewise. 1998-03-27 13:49 Ulrich Drepper <drepper@cygnus.com> * sysdeps/i386/bits/string.h: Correct things which never worked. * sysdeps/i386/i486/bits/string.h: Add clobber marks. Patches by Bernd Schmidt <crux@Pool.Informatik.RWTH-Aachen.DE>. 1998-03-27 Ulrich Drepper <drepper@cygnus.com> * intl/textdomain.c [_LIBC]: Define strdup only if not yet defined. Reported by Thorsten Kukuk.
This commit is contained in:
44
misc/error.c
44
misc/error.c
@@ -1,5 +1,5 @@
|
||||
/* Error handler for noninteractive utilities
|
||||
Copyright (C) 1990,91,92,93,94,95,96,97 Free Software Foundation, Inc.
|
||||
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.
|
||||
@@ -22,7 +22,7 @@
|
||||
/* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
# include <config.h>
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
@@ -50,7 +50,7 @@ void exit ();
|
||||
#include "error.h"
|
||||
|
||||
#ifndef _
|
||||
#define _(String) String
|
||||
# define _(String) String
|
||||
#endif
|
||||
|
||||
/* If NULL, error will flush stdout, then print on stderr the program
|
||||
@@ -68,26 +68,28 @@ 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>
|
||||
# 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
|
||||
# define error __error
|
||||
# define error_at_line __error_at_line
|
||||
|
||||
#else
|
||||
#else /* not _LIBC */
|
||||
|
||||
/* The calling program should define program_name and set it to the
|
||||
name of the executing program. */
|
||||
extern char *program_name;
|
||||
|
||||
#ifndef HAVE_STRERROR_R
|
||||
# if HAVE_STRERROR
|
||||
# ifndef strerror /* On some systems, strerror is a macro */
|
||||
char *strerror ();
|
||||
# endif
|
||||
# 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;
|
||||
@@ -99,10 +101,10 @@ private_strerror (errnum)
|
||||
return _(sys_errlist[errnum]);
|
||||
return _("Unknown system error");
|
||||
}
|
||||
# define strerror private_strerror
|
||||
# endif /* HAVE_STRERROR */
|
||||
#endif /* HAVE_STRERROR_R */
|
||||
#endif /* _LIBC */
|
||||
# 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.
|
||||
@@ -111,7 +113,7 @@ private_strerror (errnum)
|
||||
/* VARARGS */
|
||||
|
||||
void
|
||||
#if defined(VA_START) && __STDC__
|
||||
#if defined VA_START && __STDC__
|
||||
error (int status, int errnum, const char *message, ...)
|
||||
#else
|
||||
error (status, errnum, message, va_alist)
|
||||
@@ -166,7 +168,7 @@ error (status, errnum, message, va_alist)
|
||||
int error_one_per_line;
|
||||
|
||||
void
|
||||
#if defined(VA_START) && __STDC__
|
||||
#if defined VA_START && __STDC__
|
||||
error_at_line (int status, int errnum, const char *file_name,
|
||||
unsigned int line_number, const char *message, ...)
|
||||
#else
|
||||
@@ -238,8 +240,8 @@ error_at_line (status, errnum, file_name, line_number, message, va_alist)
|
||||
|
||||
#ifdef _LIBC
|
||||
/* Make the weak alias. */
|
||||
#undef error
|
||||
#undef error_at_line
|
||||
# undef error
|
||||
# undef error_at_line
|
||||
weak_alias (__error, error)
|
||||
weak_alias (__error_at_line, error_at_line)
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user