Cleanup: move filename_sane & canonicalize_path functions to libutil

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

8 files changed, 10 insertions, 6 deletions

diff --git a/lib/common/hardlink.c b/lib/common/hardlink.c
index f8d4d4a..f28620f 100644
--- a/lib/common/hardlink.c
+++ b/lib/common/hardlink.c
@@ -6,6 +6,7 @@
  */
 #include "common.h"
 #include "util/rbtree.h"
+#include "util/util.h"
 
 #include <stdlib.h>
 #include <assert.h>
diff --git a/lib/fstree/Makemodule.am b/lib/fstree/Makemodule.am
index c2981ce..fec63b4 100644
--- a/lib/fstree/Makemodule.am
+++ b/lib/fstree/Makemodule.am
@@ -5,8 +5,6 @@ libfstree_a_SOURCES += lib/fstree/mknode.c lib/fstree/fstree_from_dir.c
 libfstree_a_SOURCES += lib/fstree/add_by_path.c lib/fstree/get_by_path.c
 libfstree_a_SOURCES += include/fstree.h lib/fstree/internal.h
 libfstree_a_SOURCES += lib/fstree/source_date_epoch.c
-libfstree_a_SOURCES += lib/fstree/canonicalize_name.c
-libfstree_a_SOURCES += lib/fstree/filename_sane.c
 libfstree_a_SOURCES += lib/fstree/sort_by_file.c
 libfstree_a_CFLAGS = $(AM_CFLAGS)
 libfstree_a_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/lib/fstree/fstree_from_file.c b/lib/fstree/fstree_from_file.c
index dd289bc..411c64f 100644
--- a/lib/fstree/fstree_from_file.c
+++ b/lib/fstree/fstree_from_file.c
@@ -6,6 +6,7 @@
  */
 #include "config.h"
 
+#include "util/util.h"
 #include "io/file.h"
 #include "fstree.h"
 #include "compat.h"
diff --git a/lib/fstree/hardlink.c b/lib/fstree/hardlink.c
index f45acf7..2165b5f 100644
--- a/lib/fstree/hardlink.c
+++ b/lib/fstree/hardlink.c
@@ -6,6 +6,7 @@
  */
 #include "config.h"
 
+#include "util/util.h"
 #include "fstree.h"
 
 #include <string.h>
diff --git a/lib/fstree/sort_by_file.c b/lib/fstree/sort_by_file.c
index 7f1f19f..ed4a58c 100644
--- a/lib/fstree/sort_by_file.c
+++ b/lib/fstree/sort_by_file.c
@@ -6,6 +6,7 @@
  */
 #include "config.h"
 
+#include "util/util.h"
 #include "fstree.h"
 #include "compat.h"
 
diff --git a/lib/util/Makemodule.am b/lib/util/Makemodule.am
index bc3d618..d37f2b1 100644
--- a/lib/util/Makemodule.am
+++ b/lib/util/Makemodule.am
@@ -10,6 +10,8 @@ libutil_a_SOURCES += include/util/w32threadwrap.h
 libutil_a_SOURCES += lib/util/threadpool_serial.c
 libutil_a_SOURCES += lib/util/is_memory_zero.c
 libutil_a_SOURCES += lib/util/mkdir_p.c
+libutil_a_SOURCES += lib/util/canonicalize_name.c
+libutil_a_SOURCES += lib/util/filename_sane.c
 libutil_a_CFLAGS = $(AM_CFLAGS)
 libutil_a_CPPFLAGS = $(AM_CPPFLAGS)
 
diff --git a/lib/fstree/canonicalize_name.c b/lib/util/canonicalize_name.c
index 7fbd5a7..534e89e 100644
--- a/lib/fstree/canonicalize_name.c
+++ b/lib/util/canonicalize_name.c
@@ -1,11 +1,11 @@
-/* SPDX-License-Identifier: GPL-3.0-or-later */
+/* SPDX-License-Identifier: LGPL-3.0-or-later */
 /*
  * canonicalize_name.c
  *
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
 #include "config.h"
-#include "fstree.h"
+#include "util/util.h"
 
 static void normalize_slashes(char *filename)
 {
diff --git a/lib/fstree/filename_sane.c b/lib/util/filename_sane.c
index 91c15da..b52ce4d 100644
--- a/lib/fstree/filename_sane.c
+++ b/lib/util/filename_sane.c
@@ -1,11 +1,11 @@
-/* SPDX-License-Identifier: GPL-3.0-or-later */
+/* SPDX-License-Identifier: LGPL-3.0-or-later */
 /*
  * filename_sane.c
  *
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
 #include "config.h"
-#include "fstree.h"
+#include "util/util.h"
 
 #include <string.h>