From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 11 Jul 2022 13:10:38 +0000 (+0200)
Subject: tree-wide: trivial tweaks
X-Git-Tag: v252-rc1~685
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=39e419a2b5ae4be10a474c1b99dc0dc64675bce6;p=thirdparty%2Fsystemd.git

tree-wide: trivial tweaks
---

diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index 94527eff4ca..e40ab3f5b6f 100644
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -1055,7 +1055,7 @@ int path_extract_filename(const char *path, char **ret) {
                 return -ENOMEM;
 
         *ret = TAKE_PTR(a);
-        return strlen(c) > (size_t)r ? O_DIRECTORY : 0;
+        return strlen(c) > (size_t) r ? O_DIRECTORY : 0;
 }
 
 int path_extract_directory(const char *path, char **ret) {
@@ -1109,7 +1109,7 @@ bool filename_is_valid(const char *p) {
         if (isempty(p))
                 return false;
 
-        if (dot_or_dot_dot(p))
+        if (dot_or_dot_dot(p)) /* Yes, in this context we consider "." and ".." invalid */
                 return false;
 
         e = strchrnul(p, '/');
diff --git a/src/basic/path-util.h b/src/basic/path-util.h
index 3413056b310..bb200872216 100644
--- a/src/basic/path-util.h
+++ b/src/basic/path-util.h
@@ -161,10 +161,10 @@ int path_extract_directory(const char *path, char **ret);
 bool filename_is_valid(const char *p) _pure_;
 bool path_is_valid_full(const char *p, bool accept_dot_dot) _pure_;
 static inline bool path_is_valid(const char *p) {
-        return path_is_valid_full(p, true);
+        return path_is_valid_full(p, /* accept_dot_dot= */ true);
 }
 static inline bool path_is_safe(const char *p) {
-        return path_is_valid_full(p, false);
+        return path_is_valid_full(p, /* accept_dot_dot= */ false);
 }
 bool path_is_normalized(const char *p) _pure_;