X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftest%2Ftest-path-util.c;h=82090ce99f51d4d9b7c45e2d388938c492783c8b;hp=c8dcd853978f0339d7bee0e97514ef3730ab166b;hb=adeba5008eac3105ae59256dedd087ebe006a9e6;hpb=0c6ea3a4e2ac3f350dcb58e8f08bb74b030cd624

diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
index c8dcd8539..82090ce99 100644
--- a/src/test/test-path-util.c
+++ b/src/test/test-path-util.c
@@ -79,35 +79,35 @@ static void test_path(void) {
                 char p2[] = "//aaa/.////ccc";
                 char p3[] = "/./";
 
-                assert(path_equal(path_kill_slashes(p1), "aaa/bbb/ccc"));
-                assert(path_equal(path_kill_slashes(p2), "/aaa/./ccc"));
-                assert(path_equal(path_kill_slashes(p3), "/./"));
+                assert_se(path_equal(path_kill_slashes(p1), "aaa/bbb/ccc"));
+                assert_se(path_equal(path_kill_slashes(p2), "/aaa/./ccc"));
+                assert_se(path_equal(path_kill_slashes(p3), "/./"));
         }
 }
 
 static void test_find_binary(const char *self) {
         char *p;
 
-        assert(find_binary("/bin/sh", &p) == 0);
+        assert_se(find_binary("/bin/sh", &p) == 0);
         puts(p);
-        assert(streq(p, "/bin/sh"));
+        assert_se(streq(p, "/bin/sh"));
         free(p);
 
-        assert(find_binary(self, &p) == 0);
+        assert_se(find_binary(self, &p) == 0);
         puts(p);
-        assert(endswith(p, "/test-path-util"));
-        assert(path_is_absolute(p));
+        assert_se(endswith(p, "/test-path-util"));
+        assert_se(path_is_absolute(p));
         free(p);
 
-        assert(find_binary("sh", &p) == 0);
+        assert_se(find_binary("sh", &p) == 0);
         puts(p);
-        assert(endswith(p, "/sh"));
-        assert(path_is_absolute(p));
+        assert_se(endswith(p, "/sh"));
+        assert_se(path_is_absolute(p));
         free(p);
 
-        assert(find_binary("xxxx-xxxx", &p) == -ENOENT);
+        assert_se(find_binary("xxxx-xxxx", &p) == -ENOENT);
 
-        assert(find_binary("/some/dir/xxxx-xxxx", &p) == -ENOENT);
+        assert_se(find_binary("/some/dir/xxxx-xxxx", &p) == -ENOENT);
 }
 
 static void test_prefixes(void) {
@@ -156,24 +156,31 @@ static void test_prefixes(void) {
 
         b = false;
         PATH_FOREACH_PREFIX_MORE(s, "") {
-                assert(!b);
-                assert(streq(s, ""));
+                assert_se(!b);
+                assert_se(streq(s, ""));
                 b = true;
         }
 }
 
 static void test_path_join(void) {
-        assert_se(streq(path_join("/root", "/a/b", "/c"), "/root/a/b/c"));
-        assert_se(streq(path_join("/root", "a/b", "c"), "/root/a/b/c"));
-        assert_se(streq(path_join("/root", "/a/b", "c"), "/root/a/b/c"));
-        assert_se(streq(path_join("/root", "/", "c"), "/root//c"));
-        assert_se(streq(path_join("/root", "/", NULL), "/root/"));
-
-        assert_se(streq(path_join(NULL, "/a/b", "/c"), "/a/b/c"));
-        assert_se(streq(path_join(NULL, "a/b", "c"), "a/b/c"));
-        assert_se(streq(path_join(NULL, "/a/b", "c"), "/a/b/c"));
-        assert_se(streq(path_join(NULL, "/", "c"), "//c"));
-        assert_se(streq(path_join(NULL, "/", NULL), "/"));
+
+#define test_join(root, path, rest, expected) {  \
+                _cleanup_free_ char *z = NULL;   \
+                z = path_join(root, path, rest); \
+                assert_se(streq(z, expected));   \
+        }
+
+        test_join("/root", "/a/b", "/c", "/root/a/b/c");
+        test_join("/root", "a/b", "c", "/root/a/b/c");
+        test_join("/root", "/a/b", "c", "/root/a/b/c");
+        test_join("/root", "/", "c", "/root//c");
+        test_join("/root", "/", NULL, "/root/");
+
+        test_join(NULL, "/a/b", "/c", "/a/b/c");
+        test_join(NULL, "a/b", "c", "a/b/c");
+        test_join(NULL, "/a/b", "c", "/a/b/c");
+        test_join(NULL, "/", "c", "//c");
+        test_join(NULL, "/", NULL, "/");
 }
 
 static void test_fsck_exists(void) {
@@ -192,10 +199,10 @@ static void test_make_relative(void) {
         assert_se(path_make_relative("some/relative/path", "/some/path", &result) < 0);
         assert_se(path_make_relative("/some/path", "some/relative/path", &result) < 0);
 
-#define test(from_dir, to_path, expected) {                     \
-                path_make_relative(from_dir, to_path, &result); \
-                assert_se(streq(result, expected));             \
-                free(result);                                   \
+#define test(from_dir, to_path, expected) {                \
+                _cleanup_free_ char *z = NULL;             \
+                path_make_relative(from_dir, to_path, &z); \
+                assert_se(streq(z, expected));             \
         }
 
         test("/", "/", ".");
@@ -235,6 +242,25 @@ static void test_strv_resolve(void) {
         assert_se(rm_rf_dangerous(tmp_dir, false, true, false) == 0);
 }
 
+static void test_path_startswith(void) {
+        assert_se(path_startswith("/foo/bar/barfoo/", "/foo"));
+        assert_se(path_startswith("/foo/bar/barfoo/", "/foo/"));
+        assert_se(path_startswith("/foo/bar/barfoo/", "/"));
+        assert_se(path_startswith("/foo/bar/barfoo/", "////"));
+        assert_se(path_startswith("/foo/bar/barfoo/", "/foo//bar/////barfoo///"));
+        assert_se(path_startswith("/foo/bar/barfoo/", "/foo/bar/barfoo////"));
+        assert_se(path_startswith("/foo/bar/barfoo/", "/foo/bar///barfoo/"));
+        assert_se(path_startswith("/foo/bar/barfoo/", "/foo////bar/barfoo/"));
+        assert_se(path_startswith("/foo/bar/barfoo/", "////foo/bar/barfoo/"));
+        assert_se(path_startswith("/foo/bar/barfoo/", "/foo/bar/barfoo"));
+
+        assert_se(!path_startswith("/foo/bar/barfoo/", "/foo/bar/barfooa/"));
+        assert_se(!path_startswith("/foo/bar/barfoo/", "/foo/bar/barfooa"));
+        assert_se(!path_startswith("/foo/bar/barfoo/", ""));
+        assert_se(!path_startswith("/foo/bar/barfoo/", "/bar/foo"));
+        assert_se(!path_startswith("/foo/bar/barfoo/", "/f/b/b/"));
+}
+
 int main(int argc, char **argv) {
         test_path();
         test_find_binary(argv[0]);
@@ -243,5 +269,7 @@ int main(int argc, char **argv) {
         test_fsck_exists();
         test_make_relative();
         test_strv_resolve();
+        test_path_startswith();
+
         return 0;
 }