X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrerror.c;h=9fe437db78df8a661bb2f6709b8d943b102832cc;hb=35dda7458879acb367f2cba0aaf7856cd98f5b63;hp=5dba4d975372c429a270e9a5e9aad9ab5b1d92f9;hpb=d3a50fbfd129be1326e8f163ee51f974407c0dbe;p=gnulib.git

diff --git a/lib/strerror.c b/lib/strerror.c
index 5dba4d975..9fe437db7 100644
--- a/lib/strerror.c
+++ b/lib/strerror.c
@@ -1,11 +1,11 @@
-/* strerror.c --- ANSI C compatible system error routine
+/* strerror.c --- POSIX compatible system error routine
 
-   Copyright (C) 1986, 1988, 1989, 1991, 2002 Free Software Foundation, Inc.
+   Copyright (C) 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,25 +13,37 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include <string.h>
+
+#if REPLACE_STRERROR
 
-#if 0
 # include <stdio.h>
-#endif
 
-extern int sys_nerr;
-extern char *sys_errlist[];
+# include "intprops.h"
+
+# undef strerror
+# if ! HAVE_DECL_STRERROR
+#  define strerror(n) NULL
+# endif
 
 char *
-strerror(n)
-int n;
+rpl_strerror (int n)
 {
-	static char mesg[30];
+  char *result = strerror (n);
+
+  if (result == NULL || result[0] == '\0')
+    {
+      static char const fmt[] = "Unknown error (%d)";
+      static char mesg[sizeof fmt + INT_STRLEN_BOUND (n)];
+      sprintf (mesg, fmt, n);
+      return mesg;
+    }
 
-	if (n < 0 || n >= sys_nerr) {
-		sprintf(mesg, "Unknown error (%d)", n);
-		return mesg;
-	} else
-		return sys_errlist[n];
+  return result;
 }
+
+#endif