Cleanup: move source date epoch code back to libutil

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

10 files changed, 23 insertions, 23 deletions

diff --git a/include/util/util.h b/include/util/util.h
index c18a558..6e34a82 100644
--- a/include/util/util.h
+++ b/include/util/util.h
@@ -62,4 +62,11 @@ SQFS_INTERNAL int canonicalize_name(char *filename);
  */
 SQFS_INTERNAL bool is_filename_sane(const char *name, bool check_os_specific);
 
+/*
+  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.
+ */
+SQFS_INTERNAL sqfs_u32 get_source_date_epoch(void);
+
 #endif /* SQFS_UTIL_H */
diff --git a/lib/fstree/Makemodule.am b/lib/fstree/Makemodule.am
index fec63b4..a72b820 100644
--- a/lib/fstree/Makemodule.am
+++ b/lib/fstree/Makemodule.am
@@ -4,7 +4,6 @@ libfstree_a_SOURCES += lib/fstree/post_process.c lib/fstree/get_path.c
 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/sort_by_file.c
 libfstree_a_CFLAGS = $(AM_CFLAGS)
 libfstree_a_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/lib/fstree/fstree.c b/lib/fstree/fstree.c
index 7c00755..2ea5fa2 100644
--- a/lib/fstree/fstree.c
+++ b/lib/fstree/fstree.c
@@ -5,6 +5,7 @@
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
 #include "internal.h"
+#include "util/util.h"
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/fstree/internal.h b/lib/fstree/internal.h
index d14fb4f..b876e45 100644
--- a/lib/fstree/internal.h
+++ b/lib/fstree/internal.h
@@ -10,13 +10,6 @@
 #include "config.h"
 #include "fstree.h"
 
-/*
-  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.
- */
-sqfs_u32 get_source_date_epoch(void);
-
 void fstree_insert_sorted(tree_node_t *root, tree_node_t *n);
 
 #endif /* FSTREE_INTERNAL_H */
diff --git a/lib/util/Makemodule.am b/lib/util/Makemodule.am
index d37f2b1..b65ebda 100644
--- a/lib/util/Makemodule.am
+++ b/lib/util/Makemodule.am
@@ -12,6 +12,7 @@ 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_SOURCES += lib/util/source_date_epoch.c
 libutil_a_CFLAGS = $(AM_CFLAGS)
 libutil_a_CPPFLAGS = $(AM_CPPFLAGS)
 
diff --git a/lib/fstree/source_date_epoch.c b/lib/util/source_date_epoch.c
index 1efa688..26e5530 100644
--- a/lib/fstree/source_date_epoch.c
+++ b/lib/util/source_date_epoch.c
@@ -1,10 +1,10 @@
-/* SPDX-License-Identifier: GPL-3.0-or-later */
+/* SPDX-License-Identifier: LGPL-3.0-or-later */
 /*
  * source_date_epoch.c
  *
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
-#include "internal.h"
+#include "util/util.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/tests/libfstree/Makemodule.am b/tests/libfstree/Makemodule.am
index 107a66c..2e22967 100644
--- a/tests/libfstree/Makemodule.am
+++ b/tests/libfstree/Makemodule.am
@@ -16,14 +16,14 @@ test_gen_inode_numbers_SOURCES = tests/libfstree/gen_inode_numbers.c
 test_gen_inode_numbers_LDADD = libfstree.a libutil.a libcompat.a
 
 test_add_by_path_SOURCES = tests/libfstree/add_by_path.c
-test_add_by_path_LDADD = libfstree.a libcompat.a
+test_add_by_path_LDADD = libfstree.a libutil.a libcompat.a
 
 test_get_path_SOURCES = tests/libfstree/get_path.c
-test_get_path_LDADD = libfstree.a libcompat.a
+test_get_path_LDADD = libfstree.a libutil.a libcompat.a
 
 test_fstree_sort_SOURCES = tests/libfstree/fstree_sort.c
 test_fstree_sort_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/lib/fstree
-test_fstree_sort_LDADD = libfstree.a libio.a libcompat.a
+test_fstree_sort_LDADD = libfstree.a libio.a libutil.a libcompat.a
 
 test_fstree_from_file_SOURCES = tests/libfstree/fstree_from_file.c
 test_fstree_from_file_CPPFLAGS = $(AM_CPPFLAGS)
@@ -41,12 +41,7 @@ test_fstree_from_dir_LDADD = libfstree.a libutil.a libcompat.a
 
 test_fstree_init_SOURCES = tests/libfstree/fstree_init.c
 test_fstree_init_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/lib/fstree
-test_fstree_init_LDADD = libfstree.a libio.a libcompat.a
-
-test_fstree_epoch_SOURCES = tests/libfstree/epoch.c
-test_fstree_epoch_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/lib/fstree
-test_fstree_epoch_SOURCES += lib/fstree/source_date_epoch.c
-test_fstree_epoch_LDADD = libcompat.a
+test_fstree_init_LDADD = libfstree.a libio.a libutil.a libcompat.a
 
 test_sort_file_SOURCES = tests/libfstree/sort_file.c
 test_sort_file_LDADD = libfstree.a libio.a libutil.a libcompat.a
@@ -58,8 +53,7 @@ FSTREE_TESTS = \
 	test_mknode_simple test_mknode_slink \
 	test_mknode_reg test_mknode_dir test_gen_inode_numbers \
 	test_add_by_path test_get_path test_fstree_sort test_fstree_from_file \
-	test_fstree_init \
-	test_fstree_from_dir test_fstree_glob1 test_fstree_epoch \
+	test_fstree_init test_fstree_from_dir test_fstree_glob1 \
 	test_sort_file
 
 if BUILD_TOOLS
diff --git a/tests/libfstree/fstree_init.c b/tests/libfstree/fstree_init.c
index 92bbc19..47c24ae 100644
--- a/tests/libfstree/fstree_init.c
+++ b/tests/libfstree/fstree_init.c
@@ -9,6 +9,7 @@
 #include "fstree.h"
 #include "internal.h"
 #include "util/test.h"
+#include "util/util.h"
 
 int main(int argc, char **argv)
 {
diff --git a/tests/libutil/Makemodule.am b/tests/libutil/Makemodule.am
index a3853d2..2ea2d43 100644
--- a/tests/libutil/Makemodule.am
+++ b/tests/libutil/Makemodule.am
@@ -27,9 +27,13 @@ test_filename_sane_w32_SOURCES += lib/util/filename_sane.c
 test_filename_sane_w32_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_WIN32=1
 test_filename_sane_w32_LDADD = libcompat.a
 
+test_sdate_epoch_SOURCES = tests/libutil/epoch.c
+test_sdate_epoch_LDADD = libutil.a libcompat.a
+
 LIBUTIL_TESTS = \
 	test_str_table test_rbtree test_xxhash test_threadpool test_ismemzero \
-	test_canonicalize_name test_filename_sane test_filename_sane_w32
+	test_canonicalize_name test_filename_sane test_filename_sane_w32 \
+	test_sdate_epoch
 
 check_PROGRAMS += $(LIBUTIL_TESTS)
 TESTS += $(LIBUTIL_TESTS)
diff --git a/tests/libfstree/epoch.c b/tests/libutil/epoch.c
index ce7e120..a04942e 100644
--- a/tests/libfstree/epoch.c
+++ b/tests/libutil/epoch.c
@@ -5,7 +5,7 @@
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
 #include "config.h"
-#include "internal.h"
+#include "util/util.h"
 #include "util/test.h"
 
 #if defined(_WIN32) || defined(__WINDOWS__)