X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrerror.c;h=9fe437db78df8a661bb2f6709b8d943b102832cc;hb=35dda7458879acb367f2cba0aaf7856cd98f5b63;hp=ef6234e4fa71bd866fe34ea9699224398fd7217c;hpb=d5d3e86d326de4aa7d661fde1ebb636f3efbffd5;p=gnulib.git
diff --git a/lib/strerror.c b/lib/strerror.c
index ef6234e4f..9fe437db7 100644
--- a/lib/strerror.c
+++ b/lib/strerror.c
@@ -1,12 +1,11 @@
-/* strerror.c --- ANSI C compatible system error routine
+/* strerror.c --- POSIX compatible system error routine
- Copyright (C) 1986, 1988, 1989, 1991, 2002, 2003, 2006, 2007 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
@@ -14,66 +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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
#include
+#include
+
#if REPLACE_STRERROR
-# include
# include
+# include "intprops.h"
+
# undef strerror
+# if ! HAVE_DECL_STRERROR
+# define strerror(n) NULL
+# endif
-char *rpl_strerror (int n)
+char *
+rpl_strerror (int n)
{
- static char const fmt[] = "Unknown error (%d)";
- static char mesg[sizeof fmt + sizeof n * CHAR_BIT / 3];
-
char *result = strerror (n);
- if (! result)
+ 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;
}
- return result;
-}
-
-#elif !HAVE_STRERROR
-
-#include
-/* Don't include , since it may or may not declare
- sys_errlist and its declarations may collide with ours. Just
- declare the stuff that we need directly. Standard hosted C89
- implementations define strerror and they don't need this strerror
- function, so take some liberties with the standard to cater to
- ancient or limited freestanding implementations. */
-int sprintf (char *, char const *, ...);
-extern int sys_nerr;
-extern char *sys_errlist[];
-
-char *
-strerror (int n)
-{
- static char const fmt[] = "Unknown error (%d)";
- static char mesg[sizeof fmt + sizeof n * CHAR_BIT / 3];
-
- if (n < 0 || n >= sys_nerr)
- {
- sprintf (mesg, fmt, n);
- return mesg;
- }
- else
- return sys_errlist[n];
+ return result;
}
-#else
-
-/* This declaration is solely to ensure that after preprocessing
- this file is never empty. */
-typedef int dummy;
-
#endif