Merge pull request #146 from Gottox/improve/rearrange-source

Improve/rearrange source
Gottox · Sep 21, 2023 · c18146d · c18146d
2 parents 16652b3 + 4c573e2
commit c18146d
Show file tree

Hide file tree

Showing 145 changed files with 603 additions and 683 deletions.
diff --git a/.github/codecov.yaml b/.github/codecov.yaml
@@ -1,6 +1,6 @@
 ignore:
   - "examples/"
-  - "fuzzer/"
+  - "libsqsh/fuzzer/"
   - "subprojects/"
   - "test/"
 parsers:

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -4,7 +4,7 @@ on:
     branches:
       - main
     paths:
-      - utils/*
+      - common/build_utils/*
 
 jobs:
   docker:
@@ -31,8 +31,8 @@ jobs:
           sha-${{ github.sha }}-${{ matrix.tag_suffix }}
           ${{ github.ref_name }}-${{ matrix.tag_suffix }}
           ${{ matrix.extra_tags }}
-        context: utils
-        containerfiles: utils/Dockerfile
+        context: common/build_utils
+        containerfiles: common/build_utils/Dockerfile
     - name: Push to Dockerhub
       uses: redhat-actions/push-to-registry@v2
       with:

diff --git a/utils/Dockerfile → common/build_utils/Dockerfile b/utils/Dockerfile → common/build_utils/Dockerfile
diff --git a/common/include/meson.build b/common/include/meson.build
@@ -0,0 +1,5 @@
+libsqsh_common_headers = files(
+    'sqsh_data_private.h',
+)
+
+libsqsh_common_include = include_directories('.')
diff --git a/include/sqsh_data_private.h → common/include/sqsh_data_private.h b/include/sqsh_data_private.h → common/include/sqsh_data_private.h
diff --git a/common/meson.build b/common/meson.build
@@ -0,0 +1,18 @@
+subdir('include')
+
+subdir('src')
+
+libsqsh_common_dependencies = [
+    cextras_dep,
+]
+
+libsqsh_common_c_args = ['-Wconversion', '-Wsign-conversion']
+
+libsqsh_common = static_library(
+    'sqsh',
+    libsqsh_common_sources,
+    include_directories: [libsqsh_common_include, libsqsh_include],
+    c_args: libsqsh_common_c_args,
+    dependencies: libsqsh_common_dependencies,
+    install: false,
+)
diff --git a/lib/data/compression_options_data.c → common/src/compression_options_data.c b/lib/data/compression_options_data.c → common/src/compression_options_data.c
@@ -33,7 +33,7 @@
 
 #define _DEFAULT_SOURCE
 
-#include "../../../include/sqsh_data_private.h"
+#include <sqsh_data_private.h>
 
 #include <cextras/endian_compat.h>
 

diff --git a/lib/data/directory_data.c → common/src/directory_data.c b/lib/data/directory_data.c → common/src/directory_data.c
@@ -33,7 +33,7 @@
 
 #define _DEFAULT_SOURCE
 
-#include "../../../include/sqsh_data_private.h"
+#include <sqsh_data_private.h>
 
 #include <cextras/endian_compat.h>
 

diff --git a/lib/data/fragment_data.c → common/src/fragment_data.c b/lib/data/fragment_data.c → common/src/fragment_data.c
@@ -33,7 +33,7 @@
 
 #define _DEFAULT_SOURCE
 
-#include "../../../include/sqsh_data_private.h"
+#include <sqsh_data_private.h>
 
 #include <cextras/endian_compat.h>
 

diff --git a/lib/data/inode_data.c → common/src/inode_data.c b/lib/data/inode_data.c → common/src/inode_data.c
@@ -33,7 +33,7 @@
 
 #define _DEFAULT_SOURCE
 
-#include "../../../include/sqsh_data_private.h"
+#include <sqsh_data_private.h>
 
 #include <cextras/endian_compat.h>
 

diff --git a/common/src/meson.build b/common/src/meson.build
@@ -0,0 +1,9 @@
+libsqsh_common_sources = files(
+    'compression_options_data.c',
+    'directory_data.c',
+    'fragment_data.c',
+    'inode_data.c',
+    'metablock_data.c',
+    'superblock_data.c',
+    'xattr_data.c',
+)
diff --git a/lib/data/metablock_data.c → common/src/metablock_data.c b/lib/data/metablock_data.c → common/src/metablock_data.c
@@ -33,7 +33,7 @@
 
 #define _DEFAULT_SOURCE
 
-#include "../../../include/sqsh_data_private.h"
+#include <sqsh_data_private.h>
 
 #include <cextras/endian_compat.h>
 

diff --git a/lib/data/superblock_data.c → common/src/superblock_data.c b/lib/data/superblock_data.c → common/src/superblock_data.c
@@ -33,7 +33,7 @@
 
 #define _DEFAULT_SOURCE
 
-#include "../../../include/sqsh_data_private.h"
+#include <sqsh_data_private.h>
 
 #include <cextras/endian_compat.h>
 

diff --git a/lib/data/xattr_data.c → common/src/xattr_data.c b/lib/data/xattr_data.c → common/src/xattr_data.c
@@ -33,8 +33,8 @@
 
 #define _DEFAULT_SOURCE
 
-#include "../../../include/sqsh_data_private.h"
 #include <cextras/endian_compat.h>
+#include <sqsh_data_private.h>
 #include <string.h>
 
 uint16_t

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
@@ -30,7 +30,7 @@ WARN_AS_ERROR        = YES
 
 
 # Input files
-INPUT         = @DOXYGEN_INPUT@/README.md @DOXYGEN_INPUT@/include @DOXYGEN_INPUT@/doc @DOXYGEN_INPUT@/examples
+INPUT         = @DOXYGEN_INPUT@/README.md @DOXYGEN_INPUT@/libsqsh/include @DOXYGEN_INPUT@/include @DOXYGEN_INPUT@/doc @DOXYGEN_INPUT@/examples
 EXCLUDE       = @DOXYGEN_INPUT@/include/sqsh_data_private.h
 FILE_PATTERNS = *.c *.h *.md
 EXCLUDE_PATTERNS = *_internal.h

diff --git a/include/meson.build b/include/meson.build
@@ -1,29 +1,17 @@
 headers = files(
     'sqsh.h',
     'sqsh_archive.h',
-    'sqsh_archive_private.h',
     'sqsh_common.h',
     'sqsh_data.h',
-    'sqsh_data_private.h',
     'sqsh_directory.h',
-    'sqsh_directory_private.h',
     'sqsh_easy.h',
     'sqsh_error.h',
-    'sqsh_extract_private.h',
     'sqsh_file.h',
-    'sqsh_file_private.h',
     'sqsh_mapper.h',
-    'sqsh_mapper_private.h',
-    'sqsh_metablock_private.h',
     'sqsh_posix.h',
-    'sqsh_reader_private.h',
     'sqsh_table.h',
-    'sqsh_table_private.h',
-    'sqsh_thread_private.h',
     'sqsh_tree.h',
-    'sqsh_tree_private.h',
     'sqsh_xattr.h',
-    'sqsh_xattr_private.h',
 )
 
 libsqsh_include = include_directories('.')

diff --git a/lib/.exrc b/lib/.exrc
diff --git a/lib/README.md b/lib/README.md
diff --git a/lib/data/meson.build b/lib/data/meson.build
diff --git a/lib/meson.build b/lib/meson.build
diff --git a/fuzzer/corpus/one-file → libsqsh/fuzzer/corpus/one-file b/fuzzer/corpus/one-file → libsqsh/fuzzer/corpus/one-file
diff --git a/fuzzer/meson.build → libsqsh/fuzzer/meson.build b/fuzzer/meson.build → libsqsh/fuzzer/meson.build
diff --git a/fuzzer/simple.c → libsqsh/fuzzer/simple.c b/fuzzer/simple.c → libsqsh/fuzzer/simple.c
diff --git a/libsqsh/include/meson.build b/libsqsh/include/meson.build
@@ -0,0 +1,14 @@
+libsqsh_private_headers = files(
+    'sqsh_archive_private.h',
+    'sqsh_directory_private.h',
+    'sqsh_extract_private.h',
+    'sqsh_mapper_private.h',
+    'sqsh_metablock_private.h',
+    'sqsh_reader_private.h',
+    'sqsh_table_private.h',
+    'sqsh_thread_private.h',
+    'sqsh_tree_private.h',
+    'sqsh_xattr_private.h',
+)
+
+libsqsh_private_include = include_directories('.')
diff --git a/include/sqsh_archive_private.h → libsqsh/include/sqsh_archive_private.h b/include/sqsh_archive_private.h → libsqsh/include/sqsh_archive_private.h
diff --git a/include/sqsh_directory_private.h → libsqsh/include/sqsh_directory_private.h b/include/sqsh_directory_private.h → libsqsh/include/sqsh_directory_private.h
diff --git a/include/sqsh_extract_private.h → libsqsh/include/sqsh_extract_private.h b/include/sqsh_extract_private.h → libsqsh/include/sqsh_extract_private.h
diff --git a/include/sqsh_file_private.h → libsqsh/include/sqsh_file_private.h b/include/sqsh_file_private.h → libsqsh/include/sqsh_file_private.h
diff --git a/include/sqsh_mapper_private.h → libsqsh/include/sqsh_mapper_private.h b/include/sqsh_mapper_private.h → libsqsh/include/sqsh_mapper_private.h
diff --git a/include/sqsh_metablock_private.h → libsqsh/include/sqsh_metablock_private.h b/include/sqsh_metablock_private.h → libsqsh/include/sqsh_metablock_private.h
diff --git a/include/sqsh_reader_private.h → libsqsh/include/sqsh_reader_private.h b/include/sqsh_reader_private.h → libsqsh/include/sqsh_reader_private.h
diff --git a/include/sqsh_table_private.h → libsqsh/include/sqsh_table_private.h b/include/sqsh_table_private.h → libsqsh/include/sqsh_table_private.h
diff --git a/include/sqsh_thread_private.h → libsqsh/include/sqsh_thread_private.h b/include/sqsh_thread_private.h → libsqsh/include/sqsh_thread_private.h
diff --git a/include/sqsh_tree_private.h → libsqsh/include/sqsh_tree_private.h b/include/sqsh_tree_private.h → libsqsh/include/sqsh_tree_private.h
diff --git a/include/sqsh_xattr_private.h → libsqsh/include/sqsh_xattr_private.h b/include/sqsh_xattr_private.h → libsqsh/include/sqsh_xattr_private.h