From: Karel Zak <kzak@redhat.com>
Date: Tue, 1 Jul 2025 09:01:40 +0000 (+0200)
Subject: lib/canonicalize: rename to ul_absolute_path()
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b9f21dbd37cf149bff7ded948c69eca86ce5aa88;p=thirdparty%2Futil-linux.git

lib/canonicalize: rename to ul_absolute_path()

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/include/canonicalize.h b/include/canonicalize.h
index ff6ef0dd6..81a30ed12 100644
--- a/include/canonicalize.h
+++ b/include/canonicalize.h
@@ -20,7 +20,7 @@ extern char *canonicalize_path_restricted(const char *path);
 extern char *canonicalize_dm_name(const char *ptname);
 extern char *__canonicalize_dm_name(const char *prefix, const char *ptname);
 
-extern char *absolute_path(const char *path);
+extern char *ul_absolute_path(const char *path);
 
 static inline int is_relative_path(const char *path)
 {
diff --git a/lib/canonicalize.c b/lib/canonicalize.c
index 6e70afe18..b36115f19 100644
--- a/lib/canonicalize.c
+++ b/lib/canonicalize.c
@@ -83,7 +83,7 @@ static int is_dm_devname(char *canonical, char **name)
  * relative path. If the path is no relative than returns NULL. The path does
  * not have to exist.
  */
-char *absolute_path(const char *path)
+char *ul_absolute_path(const char *path)
 {
 	char cwd[PATH_MAX], *res, *p;
 	size_t psz, csz;
diff --git a/libmount/src/tab.c b/libmount/src/tab.c
index 4209d697a..9535dd751 100644
--- a/libmount/src/tab.c
+++ b/libmount/src/tab.c
@@ -1161,7 +1161,7 @@ struct libmnt_fs *mnt_table_find_target(struct libmnt_table *tb, const char *pat
 	}
 
 	/* try absolute path */
-	if (is_relative_path(path) && (cn = absolute_path(path))) {
+	if (is_relative_path(path) && (cn = ul_absolute_path(path))) {
 		DBG(TAB, ul_debugobj(tb, "lookup absolute TARGET: '%s'", cn));
 		mnt_reset_iter(&itr, direction);
 		while (mnt_table_next_fs(tb, &itr, &fs) == 0) {