util-lib: handle empty string in last_path_component

Now the function returns an empty string when given an empty string.
Not sure if this is the best option (maybe this should be an error?),
but at least the behaviour is well defined.

diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index 059e4fcf6a51230a2a37614322b75fb3dac6499e..3bde1d1e01bf3ddae470a5f9b2520e95d8965040 100644 (file)
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -719,6 +719,9 @@ const char *last_path_component(const char *path) {
         unsigned l, k;
 
         l = k = strlen(path);
+        if (l == 0) /* special case — an empty string */
+                return path;
+
         while (k > 0 && path[k-1] == '/')
                 k--;
 

diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
index 21d52f5d6e6736db3386f1ee610c50cc9d88ddc8..0db835608ad772cd7b576aca81498f5e726c0a55 100644 (file)
--- a/src/test/test-path-util.c
+++ b/src/test/test-path-util.c
@@ -411,6 +411,7 @@ static void test_last_path_component(void) {
         assert_se(streq(last_path_component("././/"), ".//"));
         assert_se(streq(last_path_component("/foo/a"), "a"));
         assert_se(streq(last_path_component("/foo/a/"), "a/"));
+        assert_se(streq(last_path_component(""), ""));
 }
 
 static void test_filename_is_valid(void) {