From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 21 Dec 2022 16:12:13 +0000 (+0100)
Subject: analyze: basename() → path_extract_filename()
X-Git-Tag: v253-rc1~214^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=020b66d8507340d49172fee3bf221ec676a8f18b;p=thirdparty%2Fsystemd.git

analyze: basename() → path_extract_filename()
---

diff --git a/src/analyze/analyze-verify-util.c b/src/analyze/analyze-verify-util.c
index a646e5807ca..b9f08b6d859 100644
--- a/src/analyze/analyze-verify-util.c
+++ b/src/analyze/analyze-verify-util.c
@@ -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;