tools: Introduce str_error_r()

The tools so far have been using the strerror_r() GNU variant, that
returns a string, be it the buffer passed or something else.

But that, besides being tricky in cases where we expect that the
function using strerror_r() returns the error formatted in a provided
buffer (we have to check if it returned something else and copy that
instead), breaks the build on systems not using glibc, like Alpine
Linux, where musl libc is used.

So, introduce yet another wrapper, str_error_r(), that has the GNU
interface, but uses the portable XSI variant of strerror_r(), so that
users rest asured that the provided buffer is used and it is what is
returned.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-d4t42fnf48ytlk8rjxs822tf@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index b2b3b600adf5..d9f5cc3a3667 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -361,7 +361,7 @@ static int record__mmap_evlist(struct record *rec,
                         return -errno;
                 } else {
                         pr_err("failed to mmap with %d (%s)\n", errno,
-                                strerror_r(errno, msg, sizeof(msg)));
+                                str_error_r(errno, msg, sizeof(msg)));
                         if (errno)
                                 return -errno;
                         else
@@ -407,7 +407,7 @@ try_again:
         if (perf_evlist__apply_filters(evlist, &pos)) {
                 error("failed to set filter \"%s\" on event %s with %d (%s)\n",
                         pos->filter, perf_evsel__name(pos), errno,
-                        strerror_r(errno, msg, sizeof(msg)));
+                        str_error_r(errno, msg, sizeof(msg)));
                 rc = -1;
                 goto out;
         }
@@ -1003,7 +1003,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
 
         if (forks && workload_exec_errno) {
                 char msg[STRERR_BUFSIZE];
-                const char *emsg = strerror_r(workload_exec_errno, msg, sizeof(msg));
+                const char *emsg = str_error_r(workload_exec_errno, msg, sizeof(msg));
                 pr_err("Workload failed: %s\n", emsg);
                 err = -1;
                 goto out_child;