From da8f277c094e72ccfa031bf416f174cc9d7e760e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 2 Sep 2022 11:07:22 +0200 Subject: [PATCH] bootspec: let's actually use the result of strstrip() for further parsing Also, given we are looking for whitespace as separators, just pass NULL as separators, extract_first_word() defaults to whitespace after all. --- src/shared/bootspec.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c index 90ae7887bf..c8ebbfbf19 100644 --- a/src/shared/bootspec.c +++ b/src/shared/bootspec.c @@ -205,11 +205,11 @@ static int boot_entry_load_type1( line++; - if (IN_SET(*strstrip(buf), '#', '\0')) + p = strstrip(buf); + if (IN_SET(p[0], '#', '\0')) continue; - p = buf; - r = extract_first_word(&p, &field, " \t", 0); + r = extract_first_word(&p, &field, NULL, 0); if (r < 0) { log_error_errno(r, "Failed to parse config file %s line %u: %m", tmp.path, line); continue; @@ -331,11 +331,11 @@ int boot_loader_read_conf(BootConfig *config, FILE *file, const char *path) { line++; - if (IN_SET(*strstrip(buf), '#', '\0')) + p = strstrip(buf); + if (IN_SET(p[0], '#', '\0')) continue; - p = buf; - r = extract_first_word(&p, &field, " \t", 0); + r = extract_first_word(&p, &field, NULL, 0); if (r < 0) { log_error_errno(r, "Failed to parse config file %s line %u: %m", path, line); continue;