Cleanup: move libutil related headers to "util" sub directory

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

51 files changed, 50 insertions, 52 deletions

diff --git a/difftool/sqfsdiff.h b/difftool/sqfsdiff.h
index 8cef23a..173b927 100644
--- a/difftool/sqfsdiff.h
+++ b/difftool/sqfsdiff.h
@@ -10,7 +10,7 @@
 #include "config.h"
 #include "common.h"
 #include "fstree.h"
-#include "util.h"
+#include "util/util.h"
 
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/include/common.h b/include/common.h
index 369c21f..17d709e 100644
--- a/include/common.h
+++ b/include/common.h
@@ -25,9 +25,11 @@
 #include "sqfs/xattr.h"
 #include "sqfs/dir.h"
 #include "sqfs/io.h"
-#include "compat.h"
+
+#include "util/compat.h"
+#include "util/util.h"
+
 #include "fstree.h"
-#include "util.h"
 #include "tar.h"
 
 #include <stddef.h>
diff --git a/include/fstree.h b/include/fstree.h
index a63c593..5caac51 100644
--- a/include/fstree.h
+++ b/include/fstree.h
@@ -15,7 +15,7 @@
 #include <stdio.h>
 
 #include "sqfs/predef.h"
-#include "compat.h"
+#include "util/compat.h"
 
 typedef struct tree_node_t tree_node_t;
 typedef struct file_info_t file_info_t;
diff --git a/include/tar.h b/include/tar.h
index f71757e..c5d48ef 100644
--- a/include/tar.h
+++ b/include/tar.h
@@ -8,7 +8,7 @@
 #define TAR_H
 
 #include "config.h"
-#include "util.h"
+#include "util/util.h"
 
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/include/compat.h b/include/util/compat.h
index 74d0b6f..74d0b6f 100644
--- a/include/compat.h
+++ b/include/util/compat.h
diff --git a/include/str_table.h b/include/util/str_table.h
index 60be1d1..60be1d1 100644
--- a/include/str_table.h
+++ b/include/util/str_table.h
diff --git a/include/util.h b/include/util/util.h
index 881b59c..881b59c 100644
--- a/include/util.h
+++ b/include/util/util.h
diff --git a/lib/common/data_reader_dump.c b/lib/common/data_reader_dump.c
index 91b3141..4053f73 100644
--- a/lib/common/data_reader_dump.c
+++ b/lib/common/data_reader_dump.c
@@ -5,7 +5,6 @@
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
 #include "common.h"
-#include "util.h"
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/lib/common/data_writer.c b/lib/common/data_writer.c
index 36de154..c5beba8 100644
--- a/lib/common/data_writer.c
+++ b/lib/common/data_writer.c
@@ -5,7 +5,6 @@
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
 #include "common.h"
-#include "util.h"
 
 static sqfs_u8 buffer[4096];
 
diff --git a/lib/fstree/fstree.c b/lib/fstree/fstree.c
index c18ffba..a2d9eee 100644
--- a/lib/fstree/fstree.c
+++ b/lib/fstree/fstree.c
@@ -7,7 +7,7 @@
 #include "config.h"
 
 #include "fstree.h"
-#include "util.h"
+#include "util/util.h"
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/fstree/fstree_from_file.c b/lib/fstree/fstree_from_file.c
index 59e3833..eee7d5a 100644
--- a/lib/fstree/fstree_from_file.c
+++ b/lib/fstree/fstree_from_file.c
@@ -7,7 +7,7 @@
 #include "config.h"
 
 #include "fstree.h"
-#include "util.h"
+#include "util/util.h"
 
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/lib/fstree/gen_inode_table.c b/lib/fstree/gen_inode_table.c
index 988fa79..d97c645 100644
--- a/lib/fstree/gen_inode_table.c
+++ b/lib/fstree/gen_inode_table.c
@@ -7,7 +7,7 @@
 #include "config.h"
 
 #include "fstree.h"
-#include "util.h"
+#include "util/util.h"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/lib/sqfs/comp/compressor.c b/lib/sqfs/comp/compressor.c
index 902ce92..2e2e3a3 100644
--- a/lib/sqfs/comp/compressor.c
+++ b/lib/sqfs/comp/compressor.c
@@ -11,7 +11,6 @@
 #include <stdlib.h>
 
 #include "internal.h"
-#include "util.h"
 
 typedef sqfs_compressor_t *(*compressor_fun_t)
 	(const sqfs_compressor_config_t *cfg);
diff --git a/lib/sqfs/comp/internal.h b/lib/sqfs/comp/internal.h
index 52b7fe3..875a194 100644
--- a/lib/sqfs/comp/internal.h
+++ b/lib/sqfs/comp/internal.h
@@ -14,7 +14,7 @@
 #include "sqfs/error.h"
 #include "sqfs/block.h"
 #include "sqfs/io.h"
-#include "util.h"
+#include "util/util.h"
 
 SQFS_INTERNAL
 int sqfs_generic_write_options(sqfs_file_t *file, const void *data,
diff --git a/lib/sqfs/data_reader.c b/lib/sqfs/data_reader.c
index 6a0db35..b105096 100644
--- a/lib/sqfs/data_reader.c
+++ b/lib/sqfs/data_reader.c
@@ -14,7 +14,7 @@
 #include "sqfs/table.h"
 #include "sqfs/inode.h"
 #include "sqfs/io.h"
-#include "util.h"
+#include "util/util.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/sqfs/data_writer/internal.h b/lib/sqfs/data_writer/internal.h
index ea66290..9c64b6c 100644
--- a/lib/sqfs/data_writer/internal.h
+++ b/lib/sqfs/data_writer/internal.h
@@ -16,7 +16,7 @@
 #include "sqfs/error.h"
 #include "sqfs/block.h"
 #include "sqfs/io.h"
-#include "util.h"
+#include "util/util.h"
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/sqfs/dir_reader.c b/lib/sqfs/dir_reader.c
index f8950d7..e1ff9bc 100644
--- a/lib/sqfs/dir_reader.c
+++ b/lib/sqfs/dir_reader.c
@@ -14,7 +14,7 @@
 #include "sqfs/inode.h"
 #include "sqfs/error.h"
 #include "sqfs/dir.h"
-#include "util.h"
+#include "util/util.h"
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/sqfs/dir_writer.c b/lib/sqfs/dir_writer.c
index a4aebe6..5ce29b6 100644
--- a/lib/sqfs/dir_writer.c
+++ b/lib/sqfs/dir_writer.c
@@ -13,7 +13,7 @@
 #include "sqfs/error.h"
 #include "sqfs/block.h"
 #include "sqfs/dir.h"
-#include "util.h"
+#include "util/util.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/sqfs/id_table.c b/lib/sqfs/id_table.c
index a320eca..4080015 100644
--- a/lib/sqfs/id_table.c
+++ b/lib/sqfs/id_table.c
@@ -11,7 +11,7 @@
 #include "sqfs/super.h"
 #include "sqfs/table.h"
 #include "sqfs/error.h"
-#include "compat.h"
+#include "util/compat.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/sqfs/meta_reader.c b/lib/sqfs/meta_reader.c
index 820e223..e8a17ad 100644
--- a/lib/sqfs/meta_reader.c
+++ b/lib/sqfs/meta_reader.c
@@ -12,7 +12,7 @@
 #include "sqfs/error.h"
 #include "sqfs/block.h"
 #include "sqfs/io.h"
-#include "util.h"
+#include "util/util.h"
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/lib/sqfs/meta_writer.c b/lib/sqfs/meta_writer.c
index 26e7618..5db4fe7 100644
--- a/lib/sqfs/meta_writer.c
+++ b/lib/sqfs/meta_writer.c
@@ -12,7 +12,7 @@
 #include "sqfs/error.h"
 #include "sqfs/block.h"
 #include "sqfs/io.h"
-#include "util.h"
+#include "util/util.h"
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/sqfs/read_inode.c b/lib/sqfs/read_inode.c
index 7e59445..e47395a 100644
--- a/lib/sqfs/read_inode.c
+++ b/lib/sqfs/read_inode.c
@@ -12,7 +12,7 @@
 #include "sqfs/super.h"
 #include "sqfs/inode.h"
 #include "sqfs/dir.h"
-#include "util.h"
+#include "util/util.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/sqfs/read_super.c b/lib/sqfs/read_super.c
index 6ac2ac4..437ee07 100644
--- a/lib/sqfs/read_super.c
+++ b/lib/sqfs/read_super.c
@@ -10,7 +10,7 @@
 #include "sqfs/super.h"
 #include "sqfs/error.h"
 #include "sqfs/io.h"
-#include "util.h"
+#include "util/util.h"
 
 #include <string.h>
 
diff --git a/lib/sqfs/read_table.c b/lib/sqfs/read_table.c
index 096ac1a..747c8bc 100644
--- a/lib/sqfs/read_table.c
+++ b/lib/sqfs/read_table.c
@@ -12,7 +12,7 @@
 #include "sqfs/table.h"
 #include "sqfs/block.h"
 #include "sqfs/io.h"
-#include "util.h"
+#include "util/util.h"
 
 #include <stdlib.h>
 
diff --git a/lib/sqfs/read_tree.c b/lib/sqfs/read_tree.c
index 3a43769..f9c2a4e 100644
--- a/lib/sqfs/read_tree.c
+++ b/lib/sqfs/read_tree.c
@@ -15,7 +15,7 @@
 #include "sqfs/inode.h"
 #include "sqfs/error.h"
 #include "sqfs/dir.h"
-#include "util.h"
+#include "util/util.h"
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/sqfs/readdir.c b/lib/sqfs/readdir.c
index 8899475..d800cb7 100644
--- a/lib/sqfs/readdir.c
+++ b/lib/sqfs/readdir.c
@@ -10,7 +10,7 @@
 #include "sqfs/meta_reader.h"
 #include "sqfs/error.h"
 #include "sqfs/dir.h"
-#include "compat.h"
+#include "util/compat.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/sqfs/super.c b/lib/sqfs/super.c
index 8e39b55..15b185d 100644
--- a/lib/sqfs/super.c
+++ b/lib/sqfs/super.c
@@ -10,7 +10,7 @@
 #include "sqfs/super.h"
 #include "sqfs/error.h"
 #include "sqfs/io.h"
-#include "util.h"
+#include "util/util.h"
 
 #include <string.h>
 #include <unistd.h>
diff --git a/lib/sqfs/write_inode.c b/lib/sqfs/write_inode.c
index 2e69b80..c78c852 100644
--- a/lib/sqfs/write_inode.c
+++ b/lib/sqfs/write_inode.c
@@ -11,7 +11,7 @@
 #include "sqfs/error.h"
 #include "sqfs/inode.h"
 #include "sqfs/dir.h"
-#include "compat.h"
+#include "util/compat.h"
 
 static int write_block_sizes(sqfs_meta_writer_t *ir,
 			     const sqfs_inode_generic_t *n)
diff --git a/lib/sqfs/write_table.c b/lib/sqfs/write_table.c
index 1931b83..b8946a5 100644
--- a/lib/sqfs/write_table.c
+++ b/lib/sqfs/write_table.c
@@ -13,7 +13,7 @@
 #include "sqfs/table.h"
 #include "sqfs/block.h"
 #include "sqfs/io.h"
-#include "util.h"
+#include "util/util.h"
 
 #include <stdlib.h>
 
diff --git a/lib/sqfs/xattr_reader.c b/lib/sqfs/xattr_reader.c
index d5b003b..250b4bd 100644
--- a/lib/sqfs/xattr_reader.c
+++ b/lib/sqfs/xattr_reader.c
@@ -14,7 +14,7 @@
 #include "sqfs/error.h"
 #include "sqfs/block.h"
 #include "sqfs/io.h"
-#include "util.h"
+#include "util/util.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/sqfs/xattr_writer.c b/lib/sqfs/xattr_writer.c
index 22d4639..18ca657 100644
--- a/lib/sqfs/xattr_writer.c
+++ b/lib/sqfs/xattr_writer.c
@@ -15,8 +15,8 @@
 #include "sqfs/block.h"
 #include "sqfs/io.h"
 
-#include "str_table.h"
-#include "util.h"
+#include "util/str_table.h"
+#include "util/util.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/tar/internal.h b/lib/tar/internal.h
index 435cb73..77393ed 100644
--- a/lib/tar/internal.h
+++ b/lib/tar/internal.h
@@ -9,7 +9,7 @@
 
 #include "config.h"
 
-#include "util.h"
+#include "util/util.h"
 #include "tar.h"
 
 #include <string.h>
diff --git a/lib/tar/skip.c b/lib/tar/skip.c
index 0ebe013..e5c9772 100644
--- a/lib/tar/skip.c
+++ b/lib/tar/skip.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "util.h"
+#include "util/util.h"
 #include "tar.h"
 
 #include <stdio.h>
diff --git a/lib/util/Makemodule.am b/lib/util/Makemodule.am
index 77f6c05..d6d3928 100644
--- a/lib/util/Makemodule.am
+++ b/lib/util/Makemodule.am
@@ -1,5 +1,5 @@
-libutil_la_SOURCES = include/util.h include/compat.h
-libutil_la_SOURCES += lib/util/str_table.c include/str_table.h
+libutil_la_SOURCES = include/util/util.h include/util/compat.h
+libutil_la_SOURCES += lib/util/str_table.c include/util/str_table.h
 libutil_la_SOURCES += lib/util/alloc.c lib/util/canonicalize_name.c
 libutil_la_CFLAGS = $(AM_CFLAGS)
 libutil_la_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/lib/util/alloc.c b/lib/util/alloc.c
index da99d01..526a4d5 100644
--- a/lib/util/alloc.c
+++ b/lib/util/alloc.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "util.h"
+#include "util/util.h"
 
 #include <stddef.h>
 #include <stdlib.h>
diff --git a/lib/util/canonicalize_name.c b/lib/util/canonicalize_name.c
index 4abbbe9..33e1c0b 100644
--- a/lib/util/canonicalize_name.c
+++ b/lib/util/canonicalize_name.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "util.h"
+#include "util/util.h"
 
 static void normalize_slashes(char *filename)
 {
diff --git a/lib/util/str_table.c b/lib/util/str_table.c
index 3554544..78206e8 100644
--- a/lib/util/str_table.c
+++ b/lib/util/str_table.c
@@ -11,8 +11,8 @@
 #include <string.h>
 
 #include "sqfs/error.h"
-#include "str_table.h"
-#include "util.h"
+#include "util/str_table.h"
+#include "util/util.h"
 
 /* R5 hash function (borrowed from reiserfs) */
 static sqfs_u32 strhash(const char *s)
diff --git a/mkfs/mkfs.h b/mkfs/mkfs.h
index 046a2a0..d89302c 100644
--- a/mkfs/mkfs.h
+++ b/mkfs/mkfs.h
@@ -11,7 +11,7 @@
 
 #include "common.h"
 #include "fstree.h"
-#include "util.h"
+#include "util/util.h"
 
 #ifdef HAVE_SYS_XATTR_H
 #include <sys/xattr.h>
diff --git a/tar/sqfs2tar.c b/tar/sqfs2tar.c
index ec1deac..3e64b45 100644
--- a/tar/sqfs2tar.c
+++ b/tar/sqfs2tar.c
@@ -6,7 +6,6 @@
  */
 #include "config.h"
 #include "common.h"
-#include "util.h"
 #include "tar.h"
 
 #include <getopt.h>
diff --git a/tests/canonicalize_name.c b/tests/canonicalize_name.c
index 64ca766..cabf716 100644
--- a/tests/canonicalize_name.c
+++ b/tests/canonicalize_name.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "util.h"
+#include "util/util.h"
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/tests/str_table.c b/tests/str_table.c
index 8b30b35..e4ac7a8 100644
--- a/tests/str_table.c
+++ b/tests/str_table.c
@@ -12,7 +12,7 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "str_table.h"
+#include "util/str_table.h"
 
 #define STR(x) #x
 #define STRVALUE(x) STR(x)
diff --git a/tests/tar_fuzz.c b/tests/tar_fuzz.c
index 4dc20f5..aa82a50 100644
--- a/tests/tar_fuzz.c
+++ b/tests/tar_fuzz.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "util.h"
+#include "util/util.h"
 #include "tar.h"
 
 #include <unistd.h>
diff --git a/tests/tar_gnu.c b/tests/tar_gnu.c
index 5aa112c..b58c9f7 100644
--- a/tests/tar_gnu.c
+++ b/tests/tar_gnu.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "util.h"
+#include "util/util.h"
 #include "tar.h"
 
 #include <unistd.h>
diff --git a/tests/tar_pax.c b/tests/tar_pax.c
index 79301b6..f0fdef0 100644
--- a/tests/tar_pax.c
+++ b/tests/tar_pax.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "util.h"
+#include "util/util.h"
 #include "tar.h"
 
 #include <unistd.h>
diff --git a/tests/tar_sparse_gnu.c b/tests/tar_sparse_gnu.c
index 7cd6132..3546571 100644
--- a/tests/tar_sparse_gnu.c
+++ b/tests/tar_sparse_gnu.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "util.h"
+#include "util/util.h"
 #include "tar.h"
 
 #include <unistd.h>
diff --git a/tests/tar_sparse_gnu1.c b/tests/tar_sparse_gnu1.c
index 366b0f4..19106cd 100644
--- a/tests/tar_sparse_gnu1.c
+++ b/tests/tar_sparse_gnu1.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "util.h"
+#include "util/util.h"
 #include "tar.h"
 
 #include <unistd.h>
diff --git a/tests/tar_sparse_gnu2.c b/tests/tar_sparse_gnu2.c
index cfc7eb3..2171850 100644
--- a/tests/tar_sparse_gnu2.c
+++ b/tests/tar_sparse_gnu2.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "util.h"
+#include "util/util.h"
 #include "tar.h"
 
 #include <unistd.h>
diff --git a/tests/tar_ustar.c b/tests/tar_ustar.c
index 1a03784..20a0bd0 100644
--- a/tests/tar_ustar.c
+++ b/tests/tar_ustar.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "util.h"
+#include "util/util.h"
 #include "tar.h"
 
 #include <unistd.h>
diff --git a/tests/tar_xattr_bsd.c b/tests/tar_xattr_bsd.c
index 50c0150..36d8ac1 100644
--- a/tests/tar_xattr_bsd.c
+++ b/tests/tar_xattr_bsd.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "util.h"
+#include "util/util.h"
 #include "tar.h"
 
 #include <unistd.h>
diff --git a/tests/tar_xattr_schily.c b/tests/tar_xattr_schily.c
index 033941a..e543351 100644
--- a/tests/tar_xattr_schily.c
+++ b/tests/tar_xattr_schily.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "util.h"
+#include "util/util.h"
 #include "tar.h"
 
 #include <unistd.h>
diff --git a/unpack/rdsquashfs.h b/unpack/rdsquashfs.h
index c2af24a..a36d283 100644
--- a/unpack/rdsquashfs.h
+++ b/unpack/rdsquashfs.h
@@ -10,7 +10,7 @@
 #include "config.h"
 #include "common.h"
 #include "fstree.h"
-#include "util.h"
+#include "util/util.h"
 
 #ifdef HAVE_SYS_XATTR_H
 #include <sys/xattr.h>