mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-09 23:00:07 +00:00
233963756b
Thu Aug 8 01:41:43 1996 Ulrich Drepper <drepper@cygnus.com> * elf/Makefile: Undo change of Tue Aug 6 14:27:11 1996. * elf/dl-support: Add definition of `_dl_sysdep_read_whole_file'. Thu Aug 8 01:15:59 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/i386/fpu_control.h (_FPU_DEFAULT, _FPU_IEEE): Set to 0x137f to allow long double operations. Sun Aug 4 13:12:05 1996 Richard Henderson <rth@tamu.edu> Bug Fixes: * nss/nsswitch.c (_res): Remove redundant variable definition. The real one is in resolve/res_init.c, and having both prevents using -fno-common when building the shared library. * sunrpc/rpc_prot.c (_null_auth): Same. Original is in rpc_common.c. * sysdeps/unix/sysv/linux/alpha/brk.S: When PIC, define __curbrk as a .bss object not a COMMON symbol. * sysdeps/alpha/bsd-_setjmp.S, sysdeps/alpha/bsd-setjmp.S: Must load $gp before referencing __sigsetjmp symbol. Retain LITUSE for same. Optimizations: * sysdeps/alpha/strlen.S: Rearrange first-word setup and thense the main loop for better dual-issue on EV5. Rearrange binary search to pipeline better and trim one instruction. Cosmetic Changes: * time/localtime.c (localtime_r): Move lock declaration back next to the comment where it was before the 960724 change. * INSTALL, manual/maint.texi: alpha-gnu-linux -> alpha-ANYTHING-linux. The second word is supposed to be the hardware manufacturer. * sysdeps/alpha/_mcount.S: Retain LITUSE for __mcount. * sysdeps/alpha/setjmp.S: Retain LITUSE for __sigsetjmp_aux. * sysdeps/alpha/divrem.h: More local labels, retain LITUSE for _mcount. * sysdeps/alpha/alphaev5/add_n.S, sysdeps/alpha/alphaev5/lshift.S, sysdeps/alpha/alphaev5/rshift.S, sysdeps/alpha/alphaev5/sub_n.S: Same cleanups as with EV4 GMP stuff. Tue Jul 25 03:30:56 1996 Richard Henderson <rth@tamu.edu> * sysdeps/unix/sysv/linux/Makefile [misc] (sysdep_routines): Add clone. * sysdeps/unix/sysv/linux/alpha/clone.S: New file. * sysdeps/unix/sysv/linux/i386/clone.S: New file. Sun Aug 4 00:12:41 1996 David Mosberger-Tang <davidm@azstarnet.com> * sysdeps/unix/sysv/linux/gnu/types.h: Declare __fd_mask as `unsigned long'. * misc/sys/select.h: Declare fd_mask as alias of __fd_mask. Sat Aug 3 16:20:02 1996 David Mosberger-Tang <davidm@azstarnet.com> * sysdeps/unix/sysv/linux/alpha/ioperm.c (platform): Add entry for Mikasa. * socket/sys/socket.h (send, __send, sendto): Declare buffer pointer as __const. * string/tester.c (main): Test stpncpy. * sysdeps/generic/stpncpy.c (__stpncpy): Fix so it works without segfault when called with an N that is not a multiple of four and src[N-1]=='\0'. * misc/syslog.c (LogType): New variable. (openlog): If connect() with SOCK_DGRAM fails with EPROTOTYPE, try again with SOCK_STREAM (the Linux syslogd uses a socket of the latter type). (vsyslog): When LogType==SOCK_STREAM, also send ASCII NUL terminator as a record-delimiter. If __send(LogFile) fails, call closelog() so logfile gets re-opened next time. Wed Aug 7 15:15:14 1996 Ulrich Drepper <drepper@cygnus.com> * elf/dl-open (_dl_open): Add cast to avoid warning. * manual/memory.texi: Improve some examples to give readers better advice: Use `stpcpy' instead of `strcat' if possible. * manual/string.texi: Document `strtok_r' and `strtok'. * sunrpc/Makefile: Move `+gccwarn' definition before inclusion of Makeconfig. [$(cross-compiling)=no]: Change test before making librpcsvc to this from $(cross-compile). Reported by Andreas Schwab. Tue Aug 6 14:27:11 1996 Ulrich Drepper <drepper@cygnus.com> * elf/Makefile (routines): Move dl-sysdep to here... (rtld-routines): ...from here. This should make static linking work again. * locale/setlocale.c: Add local variable `lock' and add code to `setlocale' to avoid simultaneous changing of global data. * catgets/catgets.c (catopen): Use `__strdup' instead of `strdup'. * catgets/open_catalog (__open_catalog): Use `__stpcpy', `__open', `__fstat', `__read', `__mmap', `__munmap' and `__close' instead of unprotected names.
215 lines
5.2 KiB
C
215 lines
5.2 KiB
C
/* error.c -- error handler for noninteractive utilities
|
||
Copyright (C) 1990, 91, 92, 93, 94, 95, 96 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., 675 Mass Ave,
|
||
Cambridge, MA 02139, USA. */
|
||
|
||
/* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
|
||
|
||
#ifdef HAVE_CONFIG_H
|
||
#include <config.h>
|
||
#endif
|
||
|
||
#include <stdio.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
|
||
|
||
#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>
|
||
|
||
#else
|
||
|
||
/* The calling program should define program_name and set it to the
|
||
name of the executing program. */
|
||
extern char *program_name;
|
||
|
||
#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 /* _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)
|
||
fprintf (stderr, ": %s", strerror (errnum));
|
||
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)
|
||
fprintf (stderr, ": %s", strerror (errnum));
|
||
putc ('\n', stderr);
|
||
fflush (stderr);
|
||
if (status)
|
||
exit (status);
|
||
}
|