perf tools: use XSI-complaint version of strerror_r() instead of GNU-specific

[linux-2.6-microblaze.git] / tools / perf / util / target.c

diff --git a/tools/perf/util/target.c b/tools/perf/util/target.c
index 1064d5b..3f59c49 100644 (file)
--- a/tools/perf/util/target.c
+++ b/tools/perf/util/target.c
@@ -110,8 +110,17 @@ int perf_target__strerror(struct perf_target *target, int errnum,
        int idx;
        const char *msg;
 
+       BUG_ON(buflen > 0);
+
        if (errnum >= 0) {
-               strerror_r(errnum, buf, buflen);
+               const char *err = strerror_r(errnum, buf, buflen);
+
+               if (err != buf) {
+                       size_t len = strlen(err);
+                       char *c = mempcpy(buf, err, min(buflen - 1, len));
+                       *c = '\0';
+               }
+
                return 0;
        }