Deprecate external use of libio.h and _G_config.h.

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

diff --git a/stdio-common/psignal.c b/stdio-common/psignal.c
index c524bf31b0e9e273afdb7306fa776dd4dedccede..71c56a78a9da9c6169418a0a95703a65c5d8dce9 100644 (file)
--- a/stdio-common/psignal.c
+++ b/stdio-common/psignal.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,1992,1995,1996,1997,2001 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2017 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,26 +12,14 @@
    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 <stdio.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <libintl.h>
-#ifdef USE_IN_LIBIO
-# include <wchar.h>
-#endif
-
-
-#ifndef        HAVE_GNU_LD
-#define        _sys_siglist    sys_siglist
-#endif
-
-/* Defined in sys_siglist.c.  */
-extern const char *const _sys_siglist[];
-
+#include <wchar.h>
 
 /* Print out on stderr a line consisting of the test in S, a colon, a space,
    a message describing the meaning of the signal number SIG and a newline.
@@ -41,33 +29,24 @@ psignal (int sig, const char *s)
 {
   const char *colon, *desc;
 
-  if (s == NULL || s == '\0')
+  if (s == NULL || *s == '\0')
     s = colon = "";
   else
     colon = ": ";
 
   if (sig >= 0 && sig < NSIG && (desc = _sys_siglist[sig]) != NULL)
-    {
-#ifdef USE_IN_LIBIO
-      if (_IO_fwide (stderr, 0) > 0)
-       (void) __fwprintf (stderr, L"%s%s%s\n", s, colon, _(desc));
-      else
-#endif
-       (void) fprintf (stderr, "%s%s%s\n", s, colon, _(desc));
-    }
+    (void) __fxprintf (NULL, "%s%s%s\n", s, colon, _(desc));
   else
     {
       char *buf;
 
-      (void) __asprintf (&buf, _("%s%sUnknown signal %d\n"), s, colon, sig);
-
-#ifdef USE_IN_LIBIO
-      if (_IO_fwide (stderr, 0) > 0)
-       (void) __fwprintf (stderr, L"%s",  buf);
+      if (__asprintf (&buf, _("%s%sUnknown signal %d\n"), s, colon, sig) < 0)
+       (void) __fxprintf (NULL, "%s%s%s\n", s, colon, _("Unknown signal"));
       else
-#endif
-       (void) fputs (buf, stderr);
+       {
+         (void) __fxprintf (NULL, "%s", buf);
 
-      free (buf);
+         free (buf);
+       }
     }
 }