Merge pull request #78 from Gottox/fix/macos-build

Fix build on MacOS

.github/workflows/ci.yaml

@@ -104,6 +104,34 @@ jobs:
           # fuse needs root privileges on OpenBSD
           sudo meson test -C /tmp/build -t 5
 
+  build-mac:
+    runs-on: macos-latest
+    if: ${{ github.ref == 'refs/heads/main' }}
+    strategy:
+      matrix:
+        arch:
+          - x86_64
+          - arm64
+    steps:
+    - uses: actions/checkout@v3
+    - run: |
+          brew install git meson squashfs curl lz4 xz zstd macfuse
+    - run: |
+          meson setup /tmp/build \
+            -Dwerror=true \
+            -Dexamples=true \
+            -Dcurl=enabled \
+            -Dzlib=enabled \
+            -Dlz4=enabled \
+            -Dlzma=enabled \
+            -Dzstd=enabled \
+            -Dfuse-old=enabled \
+            -Dfuse=disabled \
+            -Dtest=extended \
+            -Ddoc=false
+    - run: |
+          meson test -C /tmp/build -t 5
+
   doxygen:
     needs:
     - build

lib/data/compression_options_data.c

@@ -35,11 +35,7 @@
 
 #include "../../include/sqsh_data_private.h"
 
-#if defined(__FreeBSD__)
-#	include <sys/endian.h>
-#else
-#	include <endian.h>
-#endif
+#include <cextras/endian_compat.h>
 
 struct SQSH_UNALIGNED SqshDataCompressionOptionsGzip {
 	uint32_t compression_level;

lib/data/directory_data.c

@@ -35,11 +35,7 @@
 
 #include "../../include/sqsh_data_private.h"
 
-#if defined(__FreeBSD__)
-#	include <sys/endian.h>
-#else
-#	include <endian.h>
-#endif
+#include <cextras/endian_compat.h>
 
 struct SQSH_UNALIGNED SqshDataDirectoryEntry {
 	uint16_t offset;

lib/data/fragment_data.c

@@ -35,11 +35,7 @@
 
 #include "../../include/sqsh_data_private.h"
 
-#if defined(__FreeBSD__)
-#	include <sys/endian.h>
-#else
-#	include <endian.h>
-#endif
+#include <cextras/endian_compat.h>
 
 struct SQSH_UNALIGNED SqshDataFragment {
 	uint64_t start;

lib/data/inode_data.c

@@ -35,11 +35,7 @@
 
 #include "../../include/sqsh_data_private.h"
 
-#if defined(__FreeBSD__)
-#	include <sys/endian.h>
-#else
-#	include <endian.h>
-#endif
+#include <cextras/endian_compat.h>
 
 struct SQSH_UNALIGNED SqshDataInodeDirectoryIndex {
 	uint32_t index;

lib/data/metablock_data.c

@@ -35,11 +35,7 @@
 
 #include "../../include/sqsh_data_private.h"
 
-#if defined(__FreeBSD__)
-#	include <sys/endian.h>
-#else
-#	include <endian.h>
-#endif
+#include <cextras/endian_compat.h>
 
 struct SQSH_UNALIGNED SqshDataMetablock {
 	uint16_t header;

lib/data/superblock_data.c

@@ -35,11 +35,7 @@
 
 #include "../../include/sqsh_data_private.h"
 
-#if defined(__FreeBSD__)
-#	include <sys/endian.h>
-#else
-#	include <endian.h>
-#endif
+#include <cextras/endian_compat.h>
 
 struct SQSH_UNALIGNED SqshDataSuperblock {
 	uint32_t magic;

lib/data/xattr_data.c

@@ -35,11 +35,7 @@
 
 #include "../../include/sqsh_data_private.h"
 
-#if defined(__FreeBSD__)
-#	include <sys/endian.h>
-#else
-#	include <endian.h>
-#endif
+#include <cextras/endian_compat.h>
 
 #include <string.h>
 

subprojects/cextras-990106e5492c382669a7238a2e291d655c19fedb/.meson-subproject-wrap-hash.txt

@@ -0,0 +1 @@
+e70215fb6a380f912b876c2bff3e251d358cfe38ebb79715be16c4a5c4e6d24a

subprojects/cextras-990106e5492c382669a7238a2e291d655c19fedb/include/cextras/endian_compat.h

@@ -0,0 +1,57 @@
+/******************************************************************************
+ *                                                                            *
+ * Copyright (c) 2023, Enno Boland <[email protected]>                                 *
+ *                                                                            *
+ * Redistribution and use in source and binary forms, with or without         *
+ * modification, are permitted provided that the following conditions are     *
+ * met:                                                                       *
+ *                                                                            *
+ * * Redistributions of source code must retain the above copyright notice,   *
+ *   this list of conditions and the following disclaimer.                    *
+ * * Redistributions in binary form must reproduce the above copyright        *
+ *   notice, this list of conditions and the following disclaimer in the      *
+ *   documentation and/or other materials provided with the distribution.     *
+ *                                                                            *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS    *
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,  *
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR     *
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR          *
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,      *
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,        *
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR         *
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF     *
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING       *
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS         *
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.               *
+ *                                                                            *
+ ******************************************************************************/
+
+/**
+ * @author       Enno Boland ([email protected])
+ * @file         collection.h
+ */
+
+#ifndef CEXTRA_ENDIAN_COMPAT_H
+#define CEXTRA_ENDIAN_COMPAT_H
+
+#if defined(__APPLE__)
+#	include <libkern/OSByteOrder.h>
+#	define be16toh(x) OSSwapBigToHostInt16(x)
+#	define be32toh(x) OSSwapBigToHostInt32(x)
+#	define be64toh(x) OSSwapBigToHostInt64(x)
+#	define htobe16(x) OSSwapHostToBigInt16(x)
+#	define htobe32(x) OSSwapHostToBigInt32(x)
+#	define htobe64(x) OSSwapHostToBigInt64(x)
+#	define htole16(x) OSSwapHostToLittleInt16(x)
+#	define htole32(x) OSSwapHostToLittleInt32(x)
+#	define htole64(x) OSSwapHostToLittleInt64(x)
+#	define le16toh(x) OSSwapLittleToHostInt16(x)
+#	define le32toh(x) OSSwapLittleToHostInt32(x)
+#	define le64toh(x) OSSwapLittleToHostInt64(x)
+#elif defined(__FreeBSD__)
+#	include <sys/endian.h>
+#else
+#	include <endian.h>
+#endif
+
+#endif /* CEXTRA_ENDIAN_COMPAT_H */

subprojects/cextras.wrap

@@ -1,9 +1,9 @@
 [wrap-file]
-directory = cextras-887bee6835d5fa8213a8f9ffbdf3a26f119983a3
+directory = cextras-990106e5492c382669a7238a2e291d655c19fedb
 
-source_url = https://github.com/Gottox/cextras/archive/887bee6835d5fa8213a8f9ffbdf3a26f119983a3.tar.gz
-source_filename = cextras-887bee6835d5fa8213a8f9ffbdf3a26f119983a3.tar.gz
-source_hash = d35ab0147435aac934822e00e3c12d852e4130b0d8d26aa387808a5ded772514
+source_url = https://github.com/Gottox/cextras/archive/990106e5492c382669a7238a2e291d655c19fedb.tar.gz
+source_filename = cextras-990106e5492c382669a7238a2e291d655c19fedb.tar.gz
+source_hash = fdfedf3e143f3dfeb1ca6ae970ba52f94fa5929742b0196f6b784f66ba20d2cb
 
 [provide]
 cextras=cextras_dep

test/file/file_reader.c

@@ -177,7 +177,7 @@ load_file_from_uncompressed_data_block(void) {
 }
 
 static void
-skip_over_zero_page() {
+skip_over_zero_page(void) {
 	int rv;
 	struct SqshArchive archive = {0};
 	struct SqshFile file = {0};

test/meson.build

@@ -52,12 +52,15 @@ sqsh_test_util = [
     'util.c',
 ]
 test_c_args = []
+test_cpp_args = []
 
 cc = meson.get_compiler('c')
 if cc.get_id() == 'gcc'
     test_c_args += '-Wno-pedantic'
 elif cc.get_id() == 'clang'
     test_c_args += '-Wno-gnu-designator'
+    test_cpp_args += '-Wno-variadic-macros'
+    test_cpp_args += '-Wno-c++11-extensions'
 endif
 
 mksquashfs = find_program('mksquashfs')
@@ -97,11 +100,14 @@ foreach p : sqsh_test
     endif
     this_c_args = []
     this_c_args += test_c_args
+    this_cpp_args = []
+    this_cpp_args += test_cpp_args
     t = executable(
         p.underscorify(),
         sources,
         install: false,
         c_args: this_c_args,
+        cpp_args: this_cpp_args,
         link_with: libsqsh.get_static_lib(),
         dependencies: [threads_dep, testlib_dep, cextras_dep],
     )
@@ -136,7 +142,7 @@ if get_option('test') == 'extended'
     if fuse3_dep.found()
         fs_impl += tools['sqshfs']
     endif
-    if fuse2_dep.found()
+    if fuse2_dep.found() and host_machine.system() != 'darwin'
         fs_impl += tools['sqshfs2']
     endif
 

test/reader/reader.c

@@ -162,7 +162,7 @@ test_reader_advance_to_block(void) {
 }
 
 static void
-test_reader_advance_to_two_blocks() {
+test_reader_advance_to_two_blocks(void) {
 	struct SqshReader reader = {0};
 	struct TestIterator iter = {
 			.data = "test",
@@ -184,7 +184,7 @@ test_reader_advance_to_two_blocks() {
 }
 
 static void
-test_reader_advance_to_two_blocks_with_offset() {
+test_reader_advance_to_two_blocks_with_offset(void) {
 	struct SqshReader reader = {0};
 	struct TestIterator iter = {
 			.data = "test",
@@ -206,7 +206,7 @@ test_reader_advance_to_two_blocks_with_offset() {
 }
 
 static void
-test_reader_from_buffered_to_mapped() {
+test_reader_from_buffered_to_mapped(void) {
 	struct SqshReader reader = {0};
 	struct TestIterator iter = {
 			.data = "test",
@@ -238,7 +238,7 @@ test_reader_from_buffered_to_mapped() {
 }
 
 static void
-test_reader_from_buffered_to_buffered() {
+test_reader_from_buffered_to_buffered(void) {
 	struct SqshReader reader = {0};
 	struct TestIterator iter = {
 			.data = "test",
@@ -270,7 +270,7 @@ test_reader_from_buffered_to_buffered() {
 }
 
 static void
-test_reader_advance_inside_buffered() {
+test_reader_advance_inside_buffered(void) {
 	struct SqshReader reader = {0};
 	struct TestIterator iter = {
 			.data = "test",
@@ -302,7 +302,7 @@ test_reader_advance_inside_buffered() {
 }
 
 static void
-test_reader_advance_with_zero_size() {
+test_reader_advance_with_zero_size(void) {
 	struct SqshReader reader = {0};
 	struct TestIterator iter = {
 			.data = "test",

test/util.c

@@ -11,7 +11,6 @@
 #include "../include/sqsh_mapper.h"
 
 #include <assert.h>
-#include <endian.h>
 
 const uint8_t *
 mk_stub(struct SqshArchive *sqsh, uint8_t *payload, size_t payload_size) {

tools/fs2.c

@@ -312,6 +312,16 @@ fs_getxattr(const char *path, const char *name, char *buf, size_t size) {
 	return fs_common_map_err(rv);
 }
 
+#ifdef __APPLE__
+static int
+fs_mac_getxattr(
+		const char *path, const char *name, char *buf, size_t size,
+		uint32_t position) {
+	(void)position;
+	return fs_getxattr(path, name, buf, size);
+}
+#endif
+
 static struct fuse_operations fs_oper = {
 		.access = fs_access,
 		.getattr = fs_getattr,
@@ -321,7 +331,13 @@ static struct fuse_operations fs_oper = {
 		.release = fs_release,
 		.readlink = fs_readlink,
 		.listxattr = fs_listxattr,
+#ifdef __APPLE__
+		// Dear macfuse developers, this ifdef is on you. I really try very hard
+		// to keep my source clean, but this is on you.
+		.getxattr = fs_mac_getxattr,
+#else
 		.getxattr = fs_getxattr,
+#endif
 };
 
 static int