Update copyright notices with scripts/update-copyrights

[thirdparty/glibc.git] / stdio-common / perror.c

diff --git a/stdio-common/perror.c b/stdio-common/perror.c
index 4b29f5286a14b8a42ea30e6cadf042a1a20976ec..acd97d2f7df87be13b69540787e45896cce71db2 100644 (file)
--- a/stdio-common/perror.c
+++ b/stdio-common/perror.c
@@ -1,23 +1,44 @@
-/* Copyright (C) 1991, 1992, 1993, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2014 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 Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   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
-   Library General Public License for more details.
+   Lesser 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.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
-#include <stdio.h>
 #include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <wchar.h>
+#include "libioP.h"
+
+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);
+
+  (void) __fxprintf (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.
@@ -25,15 +46,38 @@
 void
 perror (const char *s)
 {
-  char buf[1024];
   int errnum = errno;
-  const char *colon;
+  FILE *fp;
+  int fd = -1;
 
-  if (s == NULL || *s == '\0')
-    s = colon = "";
+
+  /* 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
-    colon = ": ";
+    {
+      /* 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);
+
+      if (_IO_ferror_unlocked (fp))
+       stderr->_flags |= _IO_ERR_SEEN;
 
-  (void) fprintf (stderr, "%s%s%s\n",
-                 s, colon, __strerror_r (errnum, buf, sizeof buf));
+      /* Close the stream.  */
+      fclose (fp);
+    }
 }
+libc_hidden_def (perror)