From 1fc0e33153186a90140c3d25f5d9b4537890d7cc Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 16 Aug 2001 05:23:52 +0000 Subject: Update. * misc/error.c (error): Handle wide oriented stderr stream correctly. * stdio-common/perror.c (perror): Implement according to standard. The stream orientation must not be changed if the stream was not oriented before the call. * stdio-common/Makefile (tests): Add tst-perror. * stdio-common/tst-perror.c: New file. See ChangeLog.12 for earlier changes. --- stdio-common/perror.c | 55 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 8 deletions(-) (limited to 'stdio-common/perror.c') diff --git a/stdio-common/perror.c b/stdio-common/perror.c index c22be6d..dfdd69a 100644 --- a/stdio-common/perror.c +++ b/stdio-common/perror.c @@ -19,13 +19,14 @@ #include #include #include +#include #include +#ifdef USE_IN_LIBIO +# include "libioP.h" +#endif -/* 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) +static void +perror_internal (FILE *fp, const char *s) { char buf[1024]; int errnum = errno; @@ -40,9 +41,47 @@ perror (const char *s) errstring = __strerror_r (errnum, buf, sizeof buf); #ifdef USE_IN_LIBIO - if (_IO_fwide (stderr, 0) > 0) - (void) fwprintf (stderr, L"%s%s%s\n", s, colon, errstring); + if (_IO_fwide (fp, 0) > 0) + (void) fwprintf (fp, L"%s%s%s\n", s, colon, errstring); else #endif - (void) fprintf (stderr, "%s%s%s\n", s, colon, errstring); + (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) +{ + 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) + || fileno_unlocked (stderr) == -1 + || (fd = dup (fileno_unlocked (stderr))) == -1 + || (fp = fdopen (fd, "w+")) == NULL) + { + if (__builtin_expect (fd != -1, 0)) + close (fd); + + /* Use standard error as is. */ + perror_internal (stderr, s); + } + 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); + /* Close the stream. */ + fclose (fp); + + ((_IO_FILE *) stderr)->_offset = _IO_pos_BAD; + } } -- cgit v1.1