X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fspawn-viewer.c;h=13cc79213e72776361ce6919b1fcc5f891dca95a;hb=a79b00288bf0b04818aed5ca5cfd548f0f3b55c2;hp=7818865035dd4eebdcee650b5cf9f7701198b8cc;hpb=edf4b93e2f5c849cbec49e987990b3705ea49f6a;p=lttng-tools.git

diff --git a/src/common/spawn-viewer.c b/src/common/spawn-viewer.c
index 781886503..13cc79213 100644
--- a/src/common/spawn-viewer.c
+++ b/src/common/spawn-viewer.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  * Copyright (C) 2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  * Copyright (C) 2020 Francis Deslauriers <francis.deslauriers@efficios.com>
  *
- * SPDX-License-Identifier: GPL-2.0-only
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
  */
 
@@ -69,7 +69,7 @@ static char **alloc_argv_from_user_opts(char *opts, const char *trace_path)
 {
 	int i = 0, ignore_space = 0;
 	unsigned int num_opts = 1;
-	char **argv, *token = opts;
+	char **argv, *token = opts, *saveptr = NULL;
 
 	/* Count number of arguments. */
 	do {
@@ -91,13 +91,13 @@ static char **alloc_argv_from_user_opts(char *opts, const char *trace_path)
 		goto error;
 	}
 
-	token = strtok(opts, " ");
+	token = strtok_r(opts, " ", &saveptr);
 	while (token != NULL) {
 		argv[i] = strdup(token);
 		if (argv[i] == NULL) {
 			goto error;
 		}
-		token = strtok(NULL, " ");
+		token = strtok_r(NULL, " ", &saveptr);
 		i++;
 	}