summaryrefslogtreecommitdiffstats
path: root/src/filesystem.c
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2020-08-04 16:22:16 +0200
committerDavid Robillard <d@drobilla.net>2020-08-06 17:34:42 +0200
commitbfe42327cab38b3e47a3b2afec53ea8edd4b1531 (patch)
tree2b29c7ccbaa5f4c8f0ded43caae90ad6d04baf27 /src/filesystem.c
parent18c8af55e63653c74d58137cd12434f1213f4230 (diff)
downloadlilv-bfe42327cab38b3e47a3b2afec53ea8edd4b1531.tar.gz
lilv-bfe42327cab38b3e47a3b2afec53ea8edd4b1531.tar.bz2
lilv-bfe42327cab38b3e47a3b2afec53ea8edd4b1531.zip
Remove lilv_dir_path()
This function was weird. Instead, to make a directory path with trailing separator, join nothing as in Python.
Diffstat (limited to 'src/filesystem.c')
-rw-r--r--src/filesystem.c21
1 files changed, 1 insertions, 20 deletions
diff --git a/src/filesystem.c b/src/filesystem.c
index 45ece12..a12dcba 100644
--- a/src/filesystem.c
+++ b/src/filesystem.c
@@ -170,7 +170,7 @@ char*
lilv_path_join(const char* a, const char* b)
{
if (!a) {
- return lilv_strdup(b);
+ return (b && b[0]) ? lilv_strdup(b) : NULL;
}
const size_t a_len = strlen(a);
@@ -188,25 +188,6 @@ lilv_path_join(const char* a, const char* b)
}
char*
-lilv_dir_path(const char* path)
-{
- if (!path) {
- return NULL;
- }
-
- const size_t len = strlen(path);
-
- if (lilv_is_dir_sep(path[len - 1])) {
- return lilv_strdup(path);
- }
-
- char* dir_path = (char*)calloc(len + 2, 1);
- memcpy(dir_path, path, len);
- dir_path[len] = LILV_DIR_SEP[0];
- return dir_path;
-}
-
-char*
lilv_path_canonical(const char* path)
{
if (!path) {