tst_kvcmp: Fix parsing format for /etc/os-release
PATCH 1/1 tst_kvcmp: Fix parsing format for /etc/os-release
We need to strip double quotes.
Also for openSUSE Tumbleweed, which contains ID="opensuse-tumbleweed" it "\"%s\"" does not remove trailing double quote, thus match all but double quote.
--- lib/tst_kvercmp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
lib/tst_kvercmp.c +2 -1
@@ -146,7 +146,8 @@ const char *tst_kvcmp_distname(const char *kver)return "RHEL6" ;if (access (OSRELEASE_PATH ,F_OK ) !=-1 ) { -SAFE_FILE_LINES_SCANF (NULL ,OSRELEASE_PATH ,"ID=%s" , distname); +SAFE_FILE_LINES_SCANF (NULL ,OSRELEASE_PATH ,"ID=\"%[^\"]\"" , + distname);while (*p) { *p =toupper ((unsigned char )*p);
Signature · 1 line
2.28.0
PATCH 1/1 tst_kvcmp: Fix parsing format for /etc/os-release
Hello Petr,
I tried to run this with the syscalls/utimensat01 test on Ubuntu (ID=ubuntu), it will fail with:
safe_file_ops.c:220: BROK: Expected 1 conversions got 0 FILE '/etc/os-release' at tst_kvercmp.c:152
Quoted 30 lines · Petr Vorel
We need to strip double quotes.
Also for openSUSE Tumbleweed, which contains ID="opensuse-tumbleweed" it "\"%s\"" does not remove trailing double quote, thus match all but double quote.Fixes e2e60a39b ("lib/tst_kvercmp: Add support /etc/os-release")Signed-off-by Petr Vorel <[email protected]>--- lib/tst_kvercmp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)lib/tst_kvercmp.c +2
-2@@ -146,7 +146,8 @@ const char *tst_kvcmp_distname(const char *kver)return "RHEL6" ;if (access (OSRELEASE_PATH ,F_OK ) !=-1 ) { -SAFE_FILE_LINES_SCANF (NULL ,OSRELEASE_PATH ,"ID=%s" , distname); +SAFE_FILE_LINES_SCANF (NULL ,OSRELEASE_PATH ,"ID=\"%[^\"]\"" , + distname);while (*p) { *p =toupper ((unsigned char )*p); --2.28.0
PATCH 1/1 tst_kvcmp: Fix parsing format for /etc/os-release
In reply to Petr VorelHi!
Quoted 17 lines
We need to strip double quotes.
Also for openSUSE Tumbleweed, which contains ID="opensuse-tumbleweed" it "\"%s\"" does not remove trailing double quote, thus match all but double quote.Fixes e2e60a39b ("lib/tst_kvercmp: Add support /etc/os-release")Signed-off-by Petr Vorel <[email protected]>--- lib/tst_kvercmp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)lib/tst_kvercmp.c +0
-0
lib/tst_kvercmp.c const char *tst_kvcmp_distname(const char *kver) · line 150
Quoted 6 lines
lib/tst_kvercmp.c +2
-1@@ -146,7 +146,8 @@ const char *tst_kvcmp_distname(const char *kver)return "RHEL6" ;if (access (OSRELEASE_PATH ,F_OK ) !=-1 ) { -SAFE_FILE_LINES_SCANF (NULL ,OSRELEASE_PATH ,"ID=%s" , distname); +SAFE_FILE_LINES_SCANF (NULL ,OSRELEASE_PATH ,"ID=\"%[^\"]\"" , + distname);
I guess like opensuse is the only one that uses double quotes there. Does this actually work on, for example debian, that has ID=debian in the /etc/os-release?
I guess that it may be actually easier to optionaly strip the double quotes after the scanf().
Quoted 6 lines
lib/tst_kvercmp.c +0
-0while (*p) { *p =toupper ((unsigned char )*p);Signature · 1 line
2.28.0
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH 1/1 tst_kvcmp: Fix parsing format for /etc/os-release
Hi Cyril, Po-Hsu,
Quoted 8 lines
lib/tst_kvercmp.c const char *tst_kvcmp_distname(const char *kver) · line 150
Quoted 4 lines
lib/tst_kvercmp.c +2
-1if (access (OSRELEASE_PATH ,F_OK ) !=-1 ) { -SAFE_FILE_LINES_SCANF (NULL ,OSRELEASE_PATH ,"ID=%s" , distname); +SAFE_FILE_LINES_SCANF (NULL ,OSRELEASE_PATH ,"ID=\"%[^\"]\"" , + distname);I guess like opensuse is the only one that uses double quotes there. Does this actually work on, for example debian, that has ID=debian in the
/etc/os-release?
No, sorry for overlooking that.
Quoted 2 lines
I guess that it may be actually easier to optionaly strip the double quotes after the
scanf().
+1, I'll send v2.
Kind regards,
Petr