perf script: Use strtok_r() when parsing output field list

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Apr 12, 2017 perf events

Share & tools

tip-bot for Arnaldo Carvalho de Melo

author merge bot

2017-04-12 05:36 UTC #0 lore raw

Commit-ID:  49346e858f34eda103d7c0e85c06edbaebfc83a9
Gitweb:     http://git.kernel.org/tip/49346e858f34eda103d7c0e85c06edbaebfc83a9
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Wed, 5 Apr 2017 11:43:41 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Tue, 11 Apr 2017 08:45:09 -0300

perf script: Use strtok_r() when parsing output field list

Just avoiding non-reentrant functions.

Cc David Ahern <[email protected]>

Link http://lkml.kernel.org/n/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/perf/builtin-script.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

tools/perf/builtin-script.c +2 -2

index 46acc8e..2dab70f 100644
@@ -1708,7 +1708,7 @@ static int parse_scriptname(const struct option *opt __maybe_unused,
 static int parse_output_fields(const struct option *opt __maybe_unused,
 			    const char *arg, int unset __maybe_unused)
 {
-	char *tok;
+	char *tok, *strtok_saveptr = NULL;
 	int i, imax = ARRAY_SIZE(all_output_options);
 	int j;
 	int rc = 0;

@@ -1769,7 +1769,7 @@ static int parse_output_fields(const struct option *opt __maybe_unused,
 		}
 	}
 
-	for (tok = strtok(tok, ","); tok; tok = strtok(NULL, ",")) {
+	for (tok = strtok_r(tok, ",", &strtok_saveptr); tok; tok = strtok_r(NULL, ",", &strtok_saveptr)) {
 		for (i = 0; i < imax; ++i) {
 			if (strcmp(tok, all_output_options[i].str) == 0)
 				break;