From 693f8a33db56ba884f10f1d760456c1d8fa1d72a Mon Sep 17 00:00:00 2001 From: Linus Dierheimer Date: Sat, 27 Mar 2021 18:38:00 +0100 Subject: [PATCH] fixed a bug in os module where it would show apostophes around values --- src/modules/os.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/modules/os.c b/src/modules/os.c index e63d4f12b..7445d2a5f 100644 --- a/src/modules/os.c +++ b/src/modules/os.c @@ -29,26 +29,25 @@ void ffPrintOS(FFinstance* instance) while (getline(&line, &len, osRelease) != -1) { - sscanf(line, "NAME=\"%[^\"]+", name); sscanf(line, "NAME=%[^\n]", name); - sscanf(line, "PRETTY_NAME=\"%[^\"]+", prettyName); + sscanf(line, "NAME=\"%[^\"]+", name); sscanf(line, "PRETTY_NAME=%[^\n]", prettyName); - sscanf(line, "ID=\"%[^\"]+", id); + sscanf(line, "PRETTY_NAME=\"%[^\"]+", prettyName); sscanf(line, "ID=%[^\n]", id); - sscanf(line, "ID_LIKE=\"%[^\"]+", idLike); + sscanf(line, "ID=\"%[^\"]+", id); sscanf(line, "ID_LIKE=%[^\n]", idLike); - sscanf(line, "VARIANT=\"%[^\"]+", variant); + sscanf(line, "ID_LIKE=\"%[^\"]+", idLike); sscanf(line, "VARIANT=%[^\n]", variant); - sscanf(line, "VARIANT_ID=\"%[^\"]+", variantId); + sscanf(line, "VARIANT=\"%[^\"]+", variant); sscanf(line, "VARIANT_ID=%[^\n]", variantId); - sscanf(line, "VERSION=\"%[^\"]+", version); + sscanf(line, "VARIANT_ID=\"%[^\"]+", variantId); sscanf(line, "VERSION=%[^\n]", version); - sscanf(line, "VERSION_ID=\"%[^\"]+", versionId); + sscanf(line, "VERSION=\"%[^\"]+", version); sscanf(line, "VERSION_ID=%[^\n]", versionId); - sscanf(line, "VERSION_CODENAME=\"%[^\"]+", versionCodename); + sscanf(line, "VERSION_ID=\"%[^\"]+", versionId); sscanf(line, "VERSION_CODENAME=%[^\n]", versionCodename); - sscanf(line, "BUILD_ID=\"%[^\"]+", buildId); sscanf(line, "BUILD_ID=%[^\n]", buildId); + sscanf(line, "BUILD_ID=\"%[^\"]+", buildId); } fclose(osRelease);