From: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Naohiro Aota <naota@elisp.net>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
LKML <linux-kernel@vger.kernel.org>,
Ingo Molnar <mingo@redhat.com>, Paul Mackerras <paulus@samba.org>,
Namhyung Kim <namhyung@kernel.org>
Subject: [PATCH 12/13] perf help: Use strerror_r instead of strerror
Date: Thu, 14 Aug 2014 02:22:53 +0000 [thread overview]
Message-ID: <20140814022253.3545.82136.stgit@kbuild-fedora.novalocal> (raw)
In-Reply-To: <20140814022228.3545.90481.stgit@kbuild-fedora.novalocal>
Use strerror_r instead of strerror in error messages
for thread-safety.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
---
tools/perf/builtin-help.c | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/tools/perf/builtin-help.c b/tools/perf/builtin-help.c
index 0384d93..25d2062 100644
--- a/tools/perf/builtin-help.c
+++ b/tools/perf/builtin-help.c
@@ -103,6 +103,8 @@ static int check_emacsclient_version(void)
static void exec_woman_emacs(const char *path, const char *page)
{
+ char sbuf[STRERR_BUFSIZE];
+
if (!check_emacsclient_version()) {
/* This works only with emacsclient version >= 22. */
struct strbuf man_page = STRBUF_INIT;
@@ -111,16 +113,19 @@ static void exec_woman_emacs(const char *path, const char *page)
path = "emacsclient";
strbuf_addf(&man_page, "(woman \"%s\")", page);
execlp(path, "emacsclient", "-e", man_page.buf, NULL);
- warning("failed to exec '%s': %s", path, strerror(errno));
+ warning("failed to exec '%s': %s", path,
+ strerror_r(errno, sbuf, sizeof(sbuf)));
}
}
static void exec_man_konqueror(const char *path, const char *page)
{
const char *display = getenv("DISPLAY");
+
if (display && *display) {
struct strbuf man_page = STRBUF_INIT;
const char *filename = "kfmclient";
+ char sbuf[STRERR_BUFSIZE];
/* It's simpler to launch konqueror using kfmclient. */
if (path) {
@@ -139,24 +144,31 @@ static void exec_man_konqueror(const char *path, const char *page)
path = "kfmclient";
strbuf_addf(&man_page, "man:%s(1)", page);
execlp(path, filename, "newTab", man_page.buf, NULL);
- warning("failed to exec '%s': %s", path, strerror(errno));
+ warning("failed to exec '%s': %s", path,
+ strerror_r(errno, sbuf, sizeof(sbuf)));
}
}
static void exec_man_man(const char *path, const char *page)
{
+ char sbuf[STRERR_BUFSIZE];
+
if (!path)
path = "man";
execlp(path, "man", page, NULL);
- warning("failed to exec '%s': %s", path, strerror(errno));
+ warning("failed to exec '%s': %s", path,
+ strerror_r(errno, sbuf, sizeof(sbuf)));
}
static void exec_man_cmd(const char *cmd, const char *page)
{
struct strbuf shell_cmd = STRBUF_INIT;
+ char sbuf[STRERR_BUFSIZE];
+
strbuf_addf(&shell_cmd, "%s %s", cmd, page);
execl("/bin/sh", "sh", "-c", shell_cmd.buf, NULL);
- warning("failed to exec '%s': %s", cmd, strerror(errno));
+ warning("failed to exec '%s': %s", cmd,
+ strerror_r(errno, sbuf, sizeof(sbuf)));
}
static void add_man_viewer(const char *name)
next prev parent reply other threads:[~2014-08-14 2:23 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-14 2:22 [PATCH 00/13] perf: Replace strerror with strerror_r for thread-safety Masami Hiramatsu
2014-08-14 2:22 ` [PATCH 01/13] perf probe: Don't use strerror if strlist__add failed Masami Hiramatsu
2014-08-18 8:22 ` [tip:perf/core] perf probe: Don' t " tip-bot for Masami Hiramatsu
2014-08-14 2:22 ` [PATCH 02/13] perf: Use strerror_r instead of strerror Masami Hiramatsu
2014-08-18 8:23 ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2014-08-14 2:22 ` [PATCH 03/13] perf probe: Make error messages thread-safe Masami Hiramatsu
2014-08-18 8:23 ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2014-08-14 2:22 ` [PATCH 04/13] perf/util: Replace strerror with strerror_r for thread-safety Masami Hiramatsu
2014-08-18 8:23 ` [tip:perf/core] perf util: " tip-bot for Masami Hiramatsu
2014-08-14 2:22 ` [PATCH 05/13] perf top: Use strerror_r instead of strerror Masami Hiramatsu
2014-08-18 8:23 ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2014-08-14 2:22 ` [PATCH 06/13] perf trace: " Masami Hiramatsu
2014-08-18 8:24 ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2014-08-14 2:22 ` [PATCH 07/13] perf record: " Masami Hiramatsu
2014-08-18 8:24 ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2014-08-14 2:22 ` [PATCH 08/13] perf test: " Masami Hiramatsu
2014-08-18 8:24 ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2014-08-14 2:22 ` [PATCH 09/13] perf sched: " Masami Hiramatsu
2014-08-18 8:24 ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2014-08-14 2:22 ` [PATCH 10/13] perf buildid-cache: " Masami Hiramatsu
2014-08-18 8:25 ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2014-08-14 2:22 ` [PATCH 11/13] perf kvm: " Masami Hiramatsu
2014-08-18 8:25 ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2014-08-14 2:22 ` Masami Hiramatsu [this message]
2014-08-18 8:25 ` [tip:perf/core] perf help: " tip-bot for Masami Hiramatsu
2014-08-14 2:22 ` [PATCH 13/13] perf stat: " Masami Hiramatsu
2014-08-18 8:25 ` [tip:perf/core] " tip-bot for Masami Hiramatsu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140814022253.3545.82136.stgit@kbuild-fedora.novalocal \
--to=masami.hiramatsu.pt@hitachi.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=naota@elisp.net \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®