From 5dcd267e9f0c5d93793e6d5e68279bd5dde5dff6 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer <david.oberhollenzer@sigma-star.at> Date: Thu, 19 Sep 2019 23:51:03 +0200 Subject: Move canonicalize_name back to libutil Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at> --- include/fstree.h | 9 --------- include/util.h | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'include') diff --git a/include/fstree.h b/include/fstree.h index 426964d..a93fd7c 100644 --- a/include/fstree.h +++ b/include/fstree.h @@ -292,15 +292,6 @@ void tree_node_sort_recursive(tree_node_t *root); /* resolve a path to a tree node. Returns NULL on failure and sets errno */ tree_node_t *fstree_node_from_path(fstree_t *fs, const char *path); -/* - Convert back to forward slashed, remove all preceeding and trailing slashes, - collapse all sequences of slashes, remove all path components that are '.' - and returns failure state if one of the path components is '..'. - - Returns 0 on success. -*/ -int canonicalize_name(char *filename); - /* If the environment variable SOURCE_DATE_EPOCH is set to a parsable number that fits into an unsigned 32 bit value, return its value. Otherwise, diff --git a/include/util.h b/include/util.h index 5fb5f9b..26c54e2 100644 --- a/include/util.h +++ b/include/util.h @@ -123,4 +123,13 @@ void *alloc_array(size_t item_size, size_t nmemb); SQFS_INTERNAL void *alloc_string(size_t len); +/* + Convert back to forward slashed, remove all preceeding and trailing slashes, + collapse all sequences of slashes, remove all path components that are '.' + and returns failure state if one of the path components is '..'. + + Returns 0 on success. +*/ +SQFS_INTERNAL int canonicalize_name(char *filename); + #endif /* UTIL_H */ -- cgit v1.2.3