Prep v232: Apply missing updates from upstream

[elogind.git] / src / basic / path-util.c

diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index 3af2bd0fd4ab82aeb5ede0d7fbd8274f2a9285d2..3af95bf24e2365e74d59cc9b5a35fc220baf03a9 100644 (file)
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -290,9 +290,7 @@ char **path_strv_resolve(char **l, const char *prefix) {
                         } else {
                                 /* canonicalized path goes outside of
                                  * prefix, keep the original path instead */
-                                free(u);
-                                u = orig;
-                                orig = NULL;
+                                free_and_replace(u, orig);
                         }
                 } else
                         free(t);
@@ -358,6 +356,16 @@ char* path_startswith(const char *path, const char *prefix) {
         assert(path);
         assert(prefix);
 
+        /* Returns a pointer to the start of the first component after the parts matched by
+         * the prefix, iff
+         * - both paths are absolute or both paths are relative,
+         * and
+         * - each component in prefix in turn matches a component in path at the same position.
+         * An empty string will be returned when the prefix and path are equivalent.
+         *
+         * Returns NULL otherwise.
+         */
+
         if ((path[0] == '/') != (prefix[0] == '/'))
                 return NULL;