path: Move pakfire_path_realpath

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/libpakfire/include/pakfire/path.h b/src/libpakfire/include/pakfire/path.h
index a8d1339ace798082cf57c8c4d3d5c0a7a34605bc..e67f8313c227c0200eb44640733403b641676f5c 100644 (file)
--- a/src/libpakfire/include/pakfire/path.h
+++ b/src/libpakfire/include/pakfire/path.h
@@ -59,4 +59,8 @@ int pakfire_path_match(const char* p, const char* s);
        __pakfire_path_replace_extension(path, sizeof(path), extension)
 int __pakfire_path_replace_extension(char* path, const size_t length, const char* extension);
 
+#define pakfire_path_realpath(dest, path) \
+       __pakfire_path_realpath(dest, sizeof(dest), path)
+int __pakfire_path_realpath(char* dest, const size_t length, const char* path);
+
 #endif /* PAKFIRE_PATH_H */

diff --git a/src/libpakfire/include/pakfire/util.h b/src/libpakfire/include/pakfire/util.h
index 16c33bb7fc0c8ef0da9f1eacd164b18ed41d0ca3..22d781a7e5ec3b40e786f14a9f5163744292facc 100644 (file)
--- a/src/libpakfire/include/pakfire/util.h
+++ b/src/libpakfire/include/pakfire/util.h
@@ -63,10 +63,6 @@ int __pakfire_unhexlify(unsigned char* dst, const size_t l, const char* src);
 
 const char* pakfire_path_relpath(const char* root, const char* path);
 
-#define pakfire_path_realpath(dest, path) \
-       __pakfire_path_realpath(dest, sizeof(dest), path)
-int __pakfire_path_realpath(char* dest, const size_t length, const char* path);
-
 // File stuff
 
 int pakfire_file_write(struct pakfire* pakfire, const char* path,

diff --git a/src/libpakfire/path.c b/src/libpakfire/path.c
index 5e820aa8a784a022f22b410b1b7eea91ef6484e3..cc0a3715327c816f3f07cfb5c564250cf2c58030 100644 (file)
--- a/src/libpakfire/path.c
+++ b/src/libpakfire/path.c
@@ -667,3 +667,14 @@ int __pakfire_path_replace_extension(char* path, const size_t length, const char
        // Compose the new string
        return __pakfire_string_format(path, length, "%s.%s", buffer, extension);
 }
+
+int __pakfire_path_realpath(char* dest, const size_t length, const char* path) {
+       char buffer[PATH_MAX];
+
+       // Resolve path to its absolute path and store it in buffer
+       char* p = realpath(path, buffer);
+       if (!p)
+               return 1;
+
+       return __pakfire_string_set(dest, length, buffer);
+}

diff --git a/src/libpakfire/util.c b/src/libpakfire/util.c
index 0c709d731a1c01731638c458ab267d8c90158de3..1464b1e9779c4075d7976c264bd462b9fa219402 100644 (file)
--- a/src/libpakfire/util.c
+++ b/src/libpakfire/util.c
@@ -68,17 +68,6 @@ const char* pakfire_path_relpath(const char* root, const char* path) {
        return NULL;
 }
 
-int __pakfire_path_realpath(char* dest, const size_t length, const char* path) {
-       char buffer[PATH_MAX];
-
-       // Resolve path to its absolute path and store it in buffer
-       char* p = realpath(path, buffer);
-       if (!p)
-               return 1;
-
-       return __pakfire_string_set(dest, length, buffer);
-}
-
 int pakfire_path_exists(const char* path) {
        return !access(path, F_OK);
 }