getloadavg: Don't clobber LIBS. Regression from previous commit.

[pspp] / lib / strerror.c

diff --git a/lib/strerror.c b/lib/strerror.c
index 8c411799a0b41e16265feaf76d25c78727348da5..d0dd1af98431674050072e6c725a6909408dc5c6 100644 (file)
--- a/lib/strerror.c
+++ b/lib/strerror.c
@@ -45,10 +45,26 @@ strerror (int n)
   if (msg)
     return (char *) msg;
 
+  /* FreeBSD rejects 0; see http://austingroupbugs.net/view.php?id=382.
+     MacOS X 10.5 does not distinguish 0 from -1.  */
+  if (n)
+    msg = strerror (n);
+  else
+    {
+      int saved_errno = errno;
+      errno = 0;
+      msg = strerror (n);
+      if (errno || (msg &&
+                    (strstr (msg, "nknown") || strstr (msg, "ndefined"))))
+        msg = "Success";
+      errno = saved_errno;
+    }
+
   /* Our strerror_r implementation might use the system's strerror
      buffer, so all other clients of strerror have to see the error
-     copied into a buffer that we manage.  */
-  msg = strerror (n);
+     copied into a buffer that we manage.  This is not thread-safe,
+     even if the system strerror is, but portable programs shouldn't
+     be using strerror if they care about thread-safety.  */
   if (!msg || !*msg)
     {
       static char const fmt[] = "Unknown error %d";