utils: add a safe version of basename

So we don't need to worry about the libgen.h include game.
And we can switch trunkname over to that, making it a bit simpler.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

1 files changed, 31 insertions, 0 deletions

diff --git a/test/test-utils.c b/test/test-utils.c
index f31b2e07..dbd58031 100644
--- a/test/test-utils.c
+++ b/test/test-utils.c
@@ -1292,6 +1292,35 @@ START_TEST(strneq_test)
 }
 END_TEST
 
+START_TEST(basename_test)
+{
+	struct test {
+		const char *path;
+		const char *expected;
+	} tests[] = {
+		{ "a", "a" },
+		{ "foo.c", "foo.c" },
+		{ "foo", "foo" },
+		{ "/path/to/foo.h", "foo.h" },
+		{ "../bar.foo", "bar.foo" },
+		{ "./bar.foo.baz", "bar.foo.baz" },
+		{ "./", NULL },
+		{ "/", NULL },
+		{ "/bar/", NULL },
+		{ "/bar", "bar" },
+		{ "", NULL },
+	};
+	struct test *t;
+
+	ARRAY_FOR_EACH(tests, t) {
+		const char *result = safe_basename(t->path);
+		if (t->expected == NULL)
+			ck_assert(result == NULL);
+		else
+			ck_assert_str_eq(result, t->expected);
+	}
+}
+END_TEST
 START_TEST(trunkname_test)
 {
 	struct test {
@@ -1300,6 +1329,7 @@ START_TEST(trunkname_test)
 	} tests[] = {
 		{ "foo.c", "foo" },
 		{ "/path/to/foo.h", "foo" },
+		{ "/path/to/foo", "foo" },
 		{ "../bar.foo", "bar" },
 		{ "./bar.foo.baz", "bar.foo" },
 		{ "./", "" },
@@ -1362,6 +1392,7 @@ litest_utils_suite(void)
 	tcase_add_test(tc, streq_test);
 	tcase_add_test(tc, strneq_test);
 	tcase_add_test(tc, trunkname_test);
+	tcase_add_test(tc, basename_test);
 
 	suite_add_tcase(s, tc);