[LTP] [PATCH v2 1/1] tst_kvcmp: Strip double quotes when parsing /etc/os-release

Petr Vorel pvorel@suse.cz
Thu Aug 20 14:43:35 CEST 2020


Hi Cyril,

> > diff --git a/lib/tst_kvercmp.c b/lib/tst_kvercmp.c
> > index 185a5c39c..dfd81ac83 100644
> > --- a/lib/tst_kvercmp.c
> > +++ b/lib/tst_kvercmp.c
> > @@ -148,6 +148,12 @@ const char *tst_kvcmp_distname(const char *kver)
> >  	if (access(OSRELEASE_PATH, F_OK) != -1) {
> >  		SAFE_FILE_LINES_SCANF(NULL, OSRELEASE_PATH, "ID=%s", distname);

> > +		if (p[0] == '"')
> > +			memmove(p, p + 1, strlen(p));

> Why can't we just do distname++ and move the p = distname after this
> condition?
Sure.

> > +		if (p[strlen(p) - 1] == '"')
> > +			p[strlen(p) - 1] = '\0';

> I guess that we can move this to the while loop with:

> 	while (*p) {
> 		if (*p == '"') {
> 			*p = 0;
> 			break;
> 		}

> 		*p = ....
> 		p++;
> 	}
OK, " shouldn't be in the middle of the character, thus safe

Thanks for the suggestions.

Kind regards,
Petr


More information about the ltp mailing list