diff options
| -rw-r--r-- | include/fstree.h | 9 | ||||
| -rw-r--r-- | include/util.h | 9 | ||||
| -rw-r--r-- | lib/fstree/Makemodule.am | 1 | ||||
| -rw-r--r-- | lib/util/Makemodule.am | 1 | ||||
| -rw-r--r-- | lib/util/canonicalize_name.c (renamed from lib/fstree/canonicalize_name.c) | 4 | ||||
| -rw-r--r-- | tests/Makemodule.am | 2 | ||||
| -rw-r--r-- | tests/canonicalize_name.c | 2 |
7 files changed, 14 insertions, 14 deletions
diff --git a/include/fstree.h b/include/fstree.h index 426964d..a93fd7c 100644 --- a/include/fstree.h +++ b/include/fstree.h @@ -293,15 +293,6 @@ void tree_node_sort_recursive(tree_node_t *root); 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, default to 0. 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 */ diff --git a/lib/fstree/Makemodule.am b/lib/fstree/Makemodule.am index 00150fd..d282de7 100644 --- a/lib/fstree/Makemodule.am +++ b/lib/fstree/Makemodule.am @@ -5,7 +5,6 @@ libfstree_a_SOURCES += lib/fstree/node_stat.c lib/fstree/mknode.c libfstree_a_SOURCES += lib/fstree/add_by_path.c lib/fstree/xattr.c libfstree_a_SOURCES += lib/fstree/node_from_path.c include/fstree.h libfstree_a_SOURCES += lib/fstree/gen_file_list.c -libfstree_a_SOURCES += lib/fstree/canonicalize_name.c libfstree_a_SOURCES += lib/fstree/source_date_epoch.c libfstree_a_CFLAGS = $(AM_CFLAGS) $(LIBSELINUX_CFLAGS) libfstree_a_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/lib/util/Makemodule.am b/lib/util/Makemodule.am index f7e06d3..2692c01 100644 --- a/lib/util/Makemodule.am +++ b/lib/util/Makemodule.am @@ -4,6 +4,7 @@ libutil_la_SOURCES += lib/util/mkdir_p.c libutil_la_SOURCES += lib/util/str_table.c include/str_table.h libutil_la_SOURCES += lib/util/dirstack.c lib/util/padd_file.c libutil_la_SOURCES += lib/util/read_data_at.c lib/util/alloc.c +libutil_la_SOURCES += lib/util/canonicalize_name.c libutil_la_CFLAGS = $(AM_CFLAGS) libutil_la_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/lib/fstree/canonicalize_name.c b/lib/util/canonicalize_name.c index 15c02be..4abbbe9 100644 --- a/lib/fstree/canonicalize_name.c +++ b/lib/util/canonicalize_name.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-3.0-or-later */ +/* SPDX-License-Identifier: LGPL-3.0-or-later */ /* * canonicalize_name.c * @@ -6,7 +6,7 @@ */ #include "config.h" -#include "fstree.h" +#include "util.h" static void normalize_slashes(char *filename) { diff --git a/tests/Makemodule.am b/tests/Makemodule.am index 4b17b34..b242bd2 100644 --- a/tests/Makemodule.am +++ b/tests/Makemodule.am @@ -1,5 +1,5 @@ test_canonicalize_name_SOURCES = tests/canonicalize_name.c -test_canonicalize_name_LDADD = libfstree.a +test_canonicalize_name_LDADD = libutil.la test_mknode_simple_SOURCES = tests/mknode_simple.c test_mknode_simple_LDADD = libfstree.a diff --git a/tests/canonicalize_name.c b/tests/canonicalize_name.c index d67bc1e..64ca766 100644 --- a/tests/canonicalize_name.c +++ b/tests/canonicalize_name.c @@ -6,7 +6,7 @@ */ #include "config.h" -#include "fstree.h" +#include "util.h" #include <string.h> #include <stdlib.h> |