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 a2865dc25cedb6baf7b470f12f2d575e0d294ae6..acd97d2f7df87be13b69540787e45896cce71db2 100644 (file)
--- a/stdio-common/perror.c
+++ b/stdio-common/perror.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1993,1997,1998,2000,2001 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
@@ -12,24 +12,20 @@
    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.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <wchar.h>
-#ifdef USE_IN_LIBIO
-# include "libioP.h"
-#endif
+#include "libioP.h"
 
 static void
-perror_internal (FILE *fp, const char *s)
+perror_internal (FILE *fp, const char *s, int errnum)
 {
   char buf[1024];
-  int errnum = errno;
   const char *colon;
   const char *errstring;
 
@@ -40,12 +36,7 @@ perror_internal (FILE *fp, const char *s)
 
   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);
+  (void) __fxprintf (fp, "%s%s%s\n", s, colon, errstring);
 }
 
 
@@ -55,33 +46,38 @@ perror_internal (FILE *fp, const char *s)
 void
 perror (const char *s)
 {
+  int errnum = errno;
   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
+      || (fd = fileno (stderr)) == -1
+      || (fd = __dup (fd)) == -1
       || (fp = fdopen (fd, "w+")) == NULL)
     {
       if (__builtin_expect (fd != -1, 0))
-       close (fd);
+       __close (fd);
 
       /* Use standard error as is.  */
-      perror_internal (stderr, s);
+      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);
+      perror_internal (fp, s, errnum);
+
+      if (_IO_ferror_unlocked (fp))
+       stderr->_flags |= _IO_ERR_SEEN;
+
       /* Close the stream.  */
       fclose (fp);
-
-      ((_IO_FILE *) stderr)->_offset = _IO_pos_BAD;
     }
 }
+libc_hidden_def (perror)