mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 21:10:07 +00:00
3ba06713f8
2002-08-04 Jakub Jelinek <jakub@redhat.com> * manual/debug.texi: Fix spelling to programmatically. Reported by <hayastan132@hotmail.com>. * include/libio.h: Add libc_hidden_proto for __uflow. * include/stdio.h: Map fopen, fdopen, fclose, fputs, fsetpos, and fgetpos to _IO_* names. Add libc_hidden_proto for fileno, fwrite, fseek, fflush_unlocked, fread_unlocked, fwrite_unlocked, fgets_unlocked, fputs_unlocked. * include/wchar.h: Add libc_hidden_proto for fputws_unlocked, putwc_unlocked, vswscanf. * libio/iolibio.h: Add libc_hidden_proto for _IO_fputs. * libio/fileno.c: Use <stdio.h> and libc_hidden_def. * libio/fseek.c: Likewise. * libio/fmemopen.c: Include "libioP.h". Call _IO_fopencookie and not fopencookie. * libio/genops.c (__uflow): Add libc_hidden_def. * libio/iofflush_u.c (fflush_unlocked): Likewise. * libio/iofgets_u.c (fgets_unlocked): Likewise. * libio/iofputs_u.c (fputs_unlocked): Likewise. * libio/iofputws_u.c (fputws_unlocked): Likewise. * libio/iofread_u.c (fread_unlocked): Likewise. * libio/iofwrite_u.c (fwrite_unlocked): Likewise. * libio/iovswscanf.c (vswscanf): Likewise. * libio/putwc_u.c (putwc_unlocked): Likewise. * libio/iofputs.c: Use libc_hidden_def instead of INTDEF. * malloc/malloc.c: Redirect fwrite calls to _IO_fwrite. * malloc/mtrace.c: Likewise. * sunrpc/clnt_perr.c: Remove fputs macro. * sunrpc/svc_simple.c: Likewise. * sunrpc/svc_tcp.c: Likewise. * sunrpc/svc_udp.c: Likewise. * sunrpc/xdr_rec.c: Likewise. * sunrpc/xdr_ref.c: Likewise. * iconv/Makefile: Add CPPFLAGS definitions with -DNOT_in_libc for iconv_prog, linereader, and charmap-dir. * locale/Makefile: Likewise for locale and charmap-dir. * malloc/Makefile: Likewise for memusagestat. * nscd/Makefile: Likewise for nscd, nscd_conf, and dbg_log. * sunrpc/Makefile: Likewise for rpc_main. * sysdeps/unix/sysv/linux/Makefile: Likewise for lddlibc4. * timezone/Makefile: Likewise for zic. * stdio-common/perror.c: Avoid multiple calls to fileno_unlocked.
93 lines
2.7 KiB
C
93 lines
2.7 KiB
C
/* Copyright (C) 1991-1993,1997,1998,2000-2002 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, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <wchar.h>
|
|
#ifdef USE_IN_LIBIO
|
|
# include "libioP.h"
|
|
#endif
|
|
|
|
static void
|
|
perror_internal (FILE *fp, const char *s, int errnum)
|
|
{
|
|
char buf[1024];
|
|
const char *colon;
|
|
const char *errstring;
|
|
|
|
if (s == NULL || *s == '\0')
|
|
s = colon = "";
|
|
else
|
|
colon = ": ";
|
|
|
|
errstring = __strerror_r (errnum, buf, sizeof buf);
|
|
|
|
#ifdef USE_IN_LIBIO
|
|
if (_IO_fwide (fp, 0) > 0)
|
|
(void) __fwprintf (fp, L"%s%s%s\n", s, colon, errstring);
|
|
else
|
|
#endif
|
|
(void) fprintf (fp, "%s%s%s\n", s, colon, errstring);
|
|
}
|
|
|
|
|
|
/* Print a line on stderr consisting of the text in S, a colon, a space,
|
|
a message describing the meaning of the contents of `errno' and a newline.
|
|
If S is NULL or "", the colon and space are omitted. */
|
|
void
|
|
perror (const char *s)
|
|
{
|
|
int errnum = errno;
|
|
#ifdef USE_IN_LIBIO
|
|
FILE *fp;
|
|
int fd = -1;
|
|
|
|
|
|
/* The standard says that 'perror' must not change the orientation
|
|
of the stream. What is supposed to happen when the stream isn't
|
|
oriented yet? In this case we'll create a new stream which is
|
|
using the same underlying file descriptor. */
|
|
if (__builtin_expect (_IO_fwide (stderr, 0) != 0, 1)
|
|
|| (fd = fileno (stderr)) == -1
|
|
|| (fd = __dup (fd)) == -1
|
|
|| (fp = fdopen (fd, "w+")) == NULL)
|
|
{
|
|
if (__builtin_expect (fd != -1, 0))
|
|
__close (fd);
|
|
|
|
/* Use standard error as is. */
|
|
perror_internal (stderr, s, errnum);
|
|
}
|
|
else
|
|
{
|
|
/* We don't have to do any special hacks regarding the file
|
|
position. Since the stderr stream wasn't used so far we just
|
|
write to the descriptor. */
|
|
perror_internal (fp, s, errnum);
|
|
/* Close the stream. */
|
|
fclose (fp);
|
|
|
|
((_IO_FILE *) stderr)->_offset = _IO_pos_BAD;
|
|
}
|
|
#else
|
|
perror_internal (stderr, s, errnum);
|
|
#endif
|
|
}
|