From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 2 Sep 2022 09:07:22 +0000 (+0200)
Subject: bootspec: let's actually use the result of strstrip() for further parsing
X-Git-Tag: v252-rc1~268^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da8f277c094e72ccfa031bf416f174cc9d7e760e;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c
index 90ae7887bf1..c8ebbfbf190 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;