github-mirror/mergerfs
2
0
Fork 0
mirror of https://github.com/trapexit/mergerfs.git synced 2024-11-22 11:02:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix config file parsing

Browse Source
This commit is contained in:
Ilya Taranov 2023-03-10 20:23:55 -08:00
parent 10a9969a64
commit d04e04e89a
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/branches.cpp
View File

@ -80,11 +80,14 @@ namespace l
uint64_t offset; uint64_t offset;
offset = s_.find_first_not_of("+<>-="); offset = s_.find_first_not_of("+<>-=");
if (offset == std::string::npos) {
return;
}
if(offset > 1) if(offset > 1)
offset = 2; offset = 2;
*instr_ = s_.substr(0,offset); *instr_ = s_.substr(0,offset);
if(offset != std::string::npos) *values_ = s_.substr(offset);
*values_ = s_.substr(offset);
} }
static static

3
tests/tests.cpp
View File

@ -86,6 +86,9 @@ test_config_branches()
TEST_CHECK(b->minfreespace() == 1234); TEST_CHECK(b->minfreespace() == 1234);
TEST_CHECK(b.to_string() == ""); TEST_CHECK(b.to_string() == "");
// Parse initial value for branch
TEST_CHECK(b.from_string(b.to_string()) == 0);
bcp0 = b; bcp0 = b;
TEST_CHECK(b.from_string("/foo/bar") == 0); TEST_CHECK(b.from_string("/foo/bar") == 0);
TEST_CHECK(b.to_string() == "/foo/bar=RW"); TEST_CHECK(b.to_string() == "/foo/bar=RW");