Merge remote-tracking branch 'origin/topic/seth/config-reader-musl-support'

* origin/topic/seth/config-reader-musl-support:
  Fix config reader regular expression for MUSL.
This commit is contained in:
Johanna Amann 2020-08-12 19:50:43 +00:00
commit 123e45ca4e
3 changed files with 3 additions and 1 deletions

View file

@ -182,7 +182,7 @@ bool Config::DoUpdate()
}
regex_t re;
if ( regcomp(&re, "^([^[:blank:]]+)[[:blank:]]+(.*[^[:blank:]])?[[:blank:]]*$", REG_EXTENDED) )
if ( regcomp(&re, "^([^[:blank:]]+)[[:blank:]]+([^[:blank:]](.*[^[:blank:]])?)?[[:blank:]]*$", REG_EXTENDED) )
{
Error(Fmt("Failed to compile regex."));
return true;

View file

@ -26,3 +26,4 @@ test_set, {
test_set, {
-
}
teststring, abc

View file

@ -24,6 +24,7 @@ test_vector 1 2 3 4 5 6
test_set (empty)
test_set EMPTY
test_set -
teststring abc
@TEST-END-FILE
@load base/protocols/ssh