Merge branch 'pull/collectd-4.0' into collectd-4.0

[collectd.git] / src / common.c

diff --git a/src/common.c b/src/common.c
index f8655a9..951bae3 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -77,10 +77,28 @@ char *sstrerror (int errnum, char *buf, size_t buflen)
 {
        buf[0] = '\0';
 #ifdef STRERROR_R_CHAR_P
-       buf = strerror_r (errnum, buf, buflen);
+       {
+               char *temp;
+               temp = strerror_r (errnum, buf, buflen);
+               if (buf[0] == '\0')
+               {
+                       if ((temp != NULL) && (temp != buf) && (temp[0] != '\0'))
+                               strncpy (buf, temp, buflen);
+                       else
+                               strncpy (buf, "strerror_r did not return "
+                                               "an error message", buflen);
+                       buf[buflen - 1] = '\0';
+               }
+       }
 #else
-       strerror_r (errnum, buf, buflen);
+       if (strerror_r (errnum, buf, buflen) != 0)
+       {
+               snprintf (buf, buflen, "Error #%i; "
+                               "Additionally, strerror_r failed.",
+                               errnum);
+       }
 #endif /* STRERROR_R_CHAR_P */
+       buf[buflen - 1] = '\0';
        return (buf);
 } /* char *sstrerror */