diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-03-10 13:35:26 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-03-11 09:19:54 +0100 |
| commit | 5fa2da125157a1beca508792ee5d9be833c2c0cb (patch) | |
| tree | a0f2c7c340f5e12430140e9921f005ef637ca5f0 /src/test/test-fstab-util.c | |
| parent | generators: warn but ignore failure to write timeouts (diff) | |
| download | systemd-5fa2da125157a1beca508792ee5d9be833c2c0cb.tar.xz systemd-5fa2da125157a1beca508792ee5d9be833c2c0cb.zip | |
shared/fstab-util: immediately drop empty options again
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.
Diffstat (limited to 'src/test/test-fstab-util.c')
| -rw-r--r-- | src/test/test-fstab-util.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/test/test-fstab-util.c b/src/test/test-fstab-util.c index 222ffbb2a7..ebbdd05ca6 100644 --- a/src/test/test-fstab-util.c +++ b/src/test/test-fstab-util.c @@ -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) { |