string-util: add delete_trailing_chars() and skip_leading_chars() helpers

And let's port over a couple of users to the new APIs.
2017-11-13 10:47:15 +01:00
parent 78f3c4bca5
commit 7546145e26
10 changed files with 92 additions and 32 deletions
@@ -382,19 +382,14 @@ int unit_name_path_escape(const char *f, char **ret) {
        if (STR_IN_SET(p, "/", ""))
                s = strdup("-");
        else {
-                char *e;
-
                if (!path_is_safe(p))
                        return -EINVAL;

                /* Truncate trailing slashes */
-                e = endswith(p, "/");
-                if (e)
-                        *e = 0;
+                delete_trailing_chars(p, "/");

                /* Truncate leading slashes */
-                if (p[0] == '/')
-                        p++;
+                p = skip_leading_chars(p, "/");

                s = unit_name_escape(p);
        }