From 91d67806719c80fbdcf1b4fd47862ae4ac2b7f74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Thu, 20 May 2021 22:47:43 +0200 Subject: [PATCH] libzutil: zfs_strcmp_shortname: remove strtok MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Brian Behlendorf Reviewed-by: John Kennedy Signed-off-by: Ahelenia Ziemiańska Closes #12094 --- lib/libzutil/zutil_device_path.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/libzutil/zutil_device_path.c b/lib/libzutil/zutil_device_path.c index be8d02673b..518f941615 100644 --- a/lib/libzutil/zutil_device_path.c +++ b/lib/libzutil/zutil_device_path.c @@ -82,21 +82,20 @@ static int zfs_strcmp_shortname(const char *name, const char *cmp_name, int wholedisk) { int path_len, cmp_len, i = 0, error = ENOENT; - char *dir, *env, *envdup = NULL; + char *dir, *env, *envdup = NULL, *tmp = NULL; char path_name[MAXPATHLEN]; - const char * const *zpool_default_import_path; + const char * const *zpool_default_import_path = NULL; size_t count; - zpool_default_import_path = zpool_default_search_paths(&count); - cmp_len = strlen(cmp_name); env = getenv("ZPOOL_IMPORT_PATH"); if (env) { envdup = strdup(env); - dir = strtok(envdup, ":"); + dir = strtok_r(envdup, ":", &tmp); } else { - dir = (char *)zpool_default_import_path[i]; + zpool_default_import_path = zpool_default_search_paths(&count); + dir = (char *)zpool_default_import_path[i]; } while (dir) { @@ -116,7 +115,7 @@ zfs_strcmp_shortname(const char *name, const char *cmp_name, int wholedisk) } if (env) { - dir = strtok(NULL, ":"); + dir = strtok_r(NULL, ":", &tmp); } else if (++i < count) { dir = (char *)zpool_default_import_path[i]; } else {