From 5b635d721a7211ef8b6c13e182af501f93b527f1 Mon Sep 17 00:00:00 2001 From: Jorgen Lundman Date: Thu, 8 Jul 2021 12:08:13 +0900 Subject: [PATCH] Replace strchrnul() with strrchr() Could have gone either way with this one, either adding it to macOS/Windows SPL, or returning it to "classic" usage with strrchr(). Since the new special way isn't really used, and only used once, we have this commit. Reviewed-by: Brian Behlendorf Reviewed-by: Ryan Moeller Signed-off-by: Jorgen Lundman Closes #12312 --- lib/libzfs/libzfs_pool.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/libzfs/libzfs_pool.c b/lib/libzfs/libzfs_pool.c index adc36c47f290..58056ac70377 100644 --- a/lib/libzfs/libzfs_pool.c +++ b/lib/libzfs/libzfs_pool.c @@ -4871,7 +4871,9 @@ zpool_load_compat(const char *compat, boolean_t *features, char *report, line != NULL; line = strtok_r(NULL, "\n", &ls)) { /* discard comments */ - *(strchrnul(line, '#')) = '\0'; + char *r = strchr(line, '#'); + if (r != NULL) + *r = '\0'; for (word = strtok_r(line, ", \t", &ws); word != NULL;