]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
analyze: basename() → path_extract_filename()
authorLennart Poettering <lennart@poettering.net>
Wed, 21 Dec 2022 16:12:13 +0000 (17:12 +0100)
committerLennart Poettering <lennart@poettering.net>
Fri, 23 Dec 2022 16:35:21 +0000 (17:35 +0100)
src/analyze/analyze-verify-util.c

index a646e5807caaaa9b2de053ac4f9f2c80eda19b4e..b9f08b6d859dccc2daf085e81641a63f7db463a6 100644 (file)
@@ -36,12 +36,9 @@ static void log_syntax_callback(const char *unit, int level, void *userdata) {
 }
 
 int verify_prepare_filename(const char *filename, char **ret) {
-        int r;
-        const char *name;
-        _cleanup_free_ char *abspath = NULL;
-        _cleanup_free_ char *dir = NULL;
-        _cleanup_free_ char *with_instance = NULL;
+        _cleanup_free_ char *abspath = NULL, *name = NULL, *dir = NULL, *with_instance = NULL;
         char *c;
+        int r;
 
         assert(filename);
         assert(ret);
@@ -50,7 +47,10 @@ int verify_prepare_filename(const char *filename, char **ret) {
         if (r < 0)
                 return r;
 
-        name = basename(abspath);
+        r = path_extract_filename(abspath, &name);
+        if (r < 0)
+                return r;
+
         if (!unit_name_is_valid(name, UNIT_NAME_ANY))
                 return -EINVAL;