diff options
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test-fs-util.c | 56 |
1 files changed, 45 insertions, 11 deletions
diff --git a/src/test/test-fs-util.c b/src/test/test-fs-util.c index fac3a1d089..2570bc5859 100644 --- a/src/test/test-fs-util.c +++ b/src/test/test-fs-util.c @@ -63,7 +63,7 @@ static void test_chase_symlinks(void) { /* Paths that use symlinks underneath the "root" */ r = chase_symlinks(p, NULL, 0, &result); - assert_se(r >= 0); + assert_se(r > 0); assert_se(path_equal(result, "/usr")); result = mfree(result); @@ -71,10 +71,15 @@ static void test_chase_symlinks(void) { assert_se(r == -ENOENT); q = strjoina(temp, "/usr"); + + r = chase_symlinks(p, temp, CHASE_NON_EXISTING, &result); + assert_se(r == 0); + assert_se(path_equal(result, q)); + assert_se(mkdir(q, 0700) >= 0); r = chase_symlinks(p, temp, 0, &result); - assert_se(r >= 0); + assert_se(r > 0); assert_se(path_equal(result, q)); p = strjoina(temp, "/slash"); @@ -82,12 +87,12 @@ static void test_chase_symlinks(void) { result = mfree(result); r = chase_symlinks(p, NULL, 0, &result); - assert_se(r >= 0); + assert_se(r > 0); assert_se(path_equal(result, "/")); result = mfree(result); r = chase_symlinks(p, temp, 0, &result); - assert_se(r >= 0); + assert_se(r > 0); assert_se(path_equal(result, temp)); /* Paths that would "escape" outside of the "root" */ @@ -97,21 +102,21 @@ static void test_chase_symlinks(void) { result = mfree(result); r = chase_symlinks(p, temp, 0, &result); - assert_se(r == 0 && path_equal(result, temp)); + assert_se(r > 0 && path_equal(result, temp)); p = strjoina(temp, "/6dotsusr"); assert_se(symlink("../../../usr", p) >= 0); result = mfree(result); r = chase_symlinks(p, temp, 0, &result); - assert_se(r == 0 && path_equal(result, q)); + assert_se(r > 0 && path_equal(result, q)); p = strjoina(temp, "/top/8dotsusr"); assert_se(symlink("../../../../usr", p) >= 0); result = mfree(result); r = chase_symlinks(p, temp, 0, &result); - assert_se(r == 0 && path_equal(result, q)); + assert_se(r > 0 && path_equal(result, q)); /* Paths that contain repeated slashes */ @@ -120,24 +125,24 @@ static void test_chase_symlinks(void) { result = mfree(result); r = chase_symlinks(p, NULL, 0, &result); - assert_se(r >= 0); + assert_se(r > 0); assert_se(path_equal(result, "/usr")); result = mfree(result); r = chase_symlinks(p, temp, 0, &result); - assert_se(r >= 0); + assert_se(r > 0); assert_se(path_equal(result, q)); /* Paths using . */ result = mfree(result); r = chase_symlinks("/etc/./.././", NULL, 0, &result); - assert_se(r >= 0); + assert_se(r > 0); assert_se(path_equal(result, "/")); result = mfree(result); r = chase_symlinks("/etc/./.././", "/etc", 0, &result); - assert_se(r == 0 && path_equal(result, "/etc")); + assert_se(r > 0 && path_equal(result, "/etc")); result = mfree(result); r = chase_symlinks("/etc/machine-id/foo", NULL, 0, &result); @@ -151,6 +156,35 @@ static void test_chase_symlinks(void) { r = chase_symlinks(p, NULL, 0, &result); assert_se(r == -ELOOP); + /* Path which doesn't exist */ + + p = strjoina(temp, "/idontexist"); + r = chase_symlinks(p, NULL, 0, &result); + assert_se(r == -ENOENT); + + r = chase_symlinks(p, NULL, CHASE_NON_EXISTING, &result); + assert_se(r == 0); + assert_se(path_equal(result, p)); + result = mfree(result); + + p = strjoina(temp, "/idontexist/meneither"); + r = chase_symlinks(p, NULL, 0, &result); + assert_se(r == -ENOENT); + + r = chase_symlinks(p, NULL, CHASE_NON_EXISTING, &result); + assert_se(r == 0); + assert_se(path_equal(result, p)); + result = mfree(result); + + /* Path which doesn't exist, but contains weird stuff */ + + p = strjoina(temp, "/idontexist/.."); + r = chase_symlinks(p, NULL, 0, &result); + assert_se(r == -ENOENT); + + r = chase_symlinks(p, NULL, CHASE_NON_EXISTING, &result); + assert_se(r == -ENOENT); + assert_se(rm_rf(temp, REMOVE_ROOT|REMOVE_PHYSICAL) >= 0); } |