shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-19 22:50:17 +03:00
Code

shared/fstab-util: immediately drop empty options again

Browse Source 
In the conversion from strv_split() to strv_split_full() done in
7bb553bb98a57b4e03804f8192bdc5a534325582, EXTRACT_DONT_COALESCE_SEPARATORS was
added. I think this was just by mistake… We never look for "empty options", so
whether we immediately ignore the extra separator or store the empty string in
strv, should make no difference.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2021-03-10 13:35:26 +01:00
parent 924f650305
commit 5fa2da1251
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/shared/fstab-util.c
View File

@ -140,7 +140,7 @@ int fstab_filter_options(const char *opts, const char *names,
break;
}
} else {
r = strv_split_full(&stor, opts, ",", EXTRACT_DONT_COALESCE_SEPARATORS | EXTRACT_UNESCAPE_SEPARATORS);
r = strv_split_full(&stor, opts, ",", EXTRACT_UNESCAPE_SEPARATORS);
if (r < 0)
return r;

6
src/test/test-fstab-util.c
View File

@ -91,9 +91,13 @@ static void test_fstab_filter_options(void) {
do_fstab_filter_options("opt =0", "x-opt\0opt\0noopt\0x-noopt\0", 0, NULL, NULL, NULL);
do_fstab_filter_options(" opt ", "opt\0x-opt\0", 0, NULL, NULL, NULL);
/* check function will NULL args */
/* check function with NULL args */
do_fstab_filter_options(NULL, "opt\0", 0, NULL, NULL, "");
do_fstab_filter_options("", "opt\0", 0, NULL, NULL, "");
/* unnecessary comma separators */
do_fstab_filter_options("opt=x,,,,", "opt\0", 1, "opt", "x", "");
do_fstab_filter_options(",,,opt=x,,,,", "opt\0", 1, "opt", "x", "");
}
static void test_fstab_find_pri(void) {