From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751972AbcGMHOj (ORCPT ); Wed, 13 Jul 2016 03:14:39 -0400 Received: from terminus.zytor.com ([198.137.202.10]:41186 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751490AbcGMHOe (ORCPT ); Wed, 13 Jul 2016 03:14:34 -0400 Date: Wed, 13 Jul 2016 00:14:08 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: dsahern@gmail.com, namhyung@kernel.org, rostedt@goodmis.org, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, jolsa@kernel.org, jpoimboe@redhat.com, mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com, wangnan0@huawei.com, acme@redhat.com Reply-To: mingo@kernel.org, jpoimboe@redhat.com, adrian.hunter@intel.com, jolsa@kernel.org, linux-kernel@vger.kernel.org, rostedt@goodmis.org, namhyung@kernel.org, dsahern@gmail.com, acme@redhat.com, wangnan0@huawei.com, hpa@zytor.com, tglx@linutronix.de To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools lib subcmd: Use str_error_r() Git-Commit-ID: 07eebccbca2c21f32b5142f1a55b3b6818c54116 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 07eebccbca2c21f32b5142f1a55b3b6818c54116 Gitweb: http://git.kernel.org/tip/07eebccbca2c21f32b5142f1a55b3b6818c54116 Author: Arnaldo Carvalho de Melo AuthorDate: Fri, 8 Jul 2016 15:26:50 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 12 Jul 2016 15:20:30 -0300 tools lib subcmd: Use str_error_r() To make it portable to non-glibc systems, that follow the XSI variant instead of the GNU specific one that gets in place when _GNU_SOURCE is defined. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Josh Poimboeuf Cc: Namhyung Kim Cc: Steven Rostedt Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-bozcszy93tpgw9ad6qm3dhpx@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/lib/subcmd/run-command.c | 5 +++-- tools/objtool/Build | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/lib/subcmd/run-command.c b/tools/lib/subcmd/run-command.c index f4f6c9e..911f839 100644 --- a/tools/lib/subcmd/run-command.c +++ b/tools/lib/subcmd/run-command.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include "subcmd-util.h" @@ -109,7 +110,7 @@ int start_command(struct child_process *cmd) if (cmd->dir && chdir(cmd->dir)) die("exec %s: cd to %s failed (%s)", cmd->argv[0], - cmd->dir, strerror_r(errno, sbuf, sizeof(sbuf))); + cmd->dir, str_error_r(errno, sbuf, sizeof(sbuf))); if (cmd->env) { for (; *cmd->env; cmd->env++) { if (strchr(*cmd->env, '=')) @@ -173,7 +174,7 @@ static int wait_or_whine(pid_t pid) if (errno == EINTR) continue; fprintf(stderr, " Error: waitpid failed (%s)", - strerror_r(errno, sbuf, sizeof(sbuf))); + str_error_r(errno, sbuf, sizeof(sbuf))); return -ERR_RUN_COMMAND_WAITPID; } if (waiting != pid) diff --git a/tools/objtool/Build b/tools/objtool/Build index 0e89258..2457916 100644 --- a/tools/objtool/Build +++ b/tools/objtool/Build @@ -5,9 +5,14 @@ objtool-y += special.o objtool-y += objtool.o objtool-y += libstring.o +objtool-y += str_error_r.o CFLAGS += -I$(srctree)/tools/lib $(OUTPUT)libstring.o: ../lib/string.c FORCE $(call rule_mkdir) $(call if_changed_dep,cc_o_c) + +$(OUTPUT)str_error_r.o: ../lib/str_error_r.c FORCE + $(call rule_mkdir) + $(call if_changed_dep,cc_o_c)