Merge branch 'mhx:main' into main

.docker/Dockerfile

@@ -1,16 +1,16 @@
 # syntax=docker/dockerfile:1
 ARG ARCH=amd64
-FROM $ARCH/ubuntu:22.04
+FROM $ARCH/ubuntu:23.10
 RUN apt update && apt install -y gnupg wget software-properties-common
 RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
 RUN apt-add-repository 'deb https://apt.kitware.com/ubuntu/ jammy main'
 RUN apt install -y \
-        gcc \
-        g++ \
         gcc-12 \
         g++-12 \
-        clang \
-        clang-15 \
+        gcc-13 \
+        g++-13 \
+        clang-16 \
+        clang-17 \
         git \
         vim \
         zstd \
@@ -52,13 +52,14 @@ RUN apt install -y \
         libfuse3-dev \
         libgoogle-glog-dev \
         libutfcpp-dev \
+        libflac++-dev \
         bash-completion \
         upx
 COPY install-static-libs.sh /usr/local/bin/install-static-libs.sh
 RUN bash /usr/local/bin/install-static-libs.sh
-RUN useradd -g users -u 1000 -m mhx
+# RUN useradd -g users -u 1000 -m mhx
 ARG SCRIPT=build-linux.sh
 COPY $SCRIPT /usr/local/bin/run.sh
 RUN chmod +x /usr/local/bin/run.sh
-USER mhx
+USER ubuntu
 ENTRYPOINT /usr/local/bin/run.sh

.docker/build-linux.sh

@@ -29,16 +29,16 @@ esac
 
 case "-$BUILD_TYPE-" in
   *-gcc-*)
-    export CC=gcc CXX=g++
+    export CC=gcc-13 CXX=g++-13
     ;;
-  *-clang-*)
-    export CC=clang CXX=clang++
-    ;;
-  *-gcc12-*)
+  *-oldgcc-*)
     export CC=gcc-12 CXX=g++-12
     ;;
-  *-clang15-*)
-    export CC=clang-15 CXX=clang++-15
+  *-clang-*)
+    export CC=clang-17 CXX=clang++-17
+    ;;
+  *-oldclang-*)
+    export CC=clang-16 CXX=clang++-16
     ;;
   *)
     echo "missing compiler in: $BUILD_TYPE"

.docker/install-static-libs.sh

@@ -6,18 +6,18 @@ cd "$HOME"
 mkdir pkgs
 cd pkgs
 
-wget https://github.com/libarchive/libarchive/releases/download/v3.6.2/libarchive-3.6.2.tar.xz
-wget ftp://ftp.astron.com/pub/file/file-5.44.tar.gz
+wget https://github.com/libarchive/libarchive/releases/download/v3.7.2/libarchive-3.7.2.tar.xz
+wget ftp://ftp.astron.com/pub/file/file-5.45.tar.gz
 
-tar xf libarchive-3.6.2.tar.xz
-cd libarchive-3.6.2
+tar xf libarchive-3.7.2.tar.xz
+cd libarchive-3.7.2
 ./configure --prefix=/opt/static-libs --without-iconv --without-xml2 --without-expat
 make -j$(nproc)
 make install
 
 cd "$HOME/pkgs"
-tar xf file-5.44.tar.gz
-cd file-5.44
+tar xf file-5.45.tar.gz
+cd file-5.45
 ./configure --prefix=/opt/static-libs --enable-static=yes --enable-shared=no
 make -j$(nproc)
 make install

.github/workflows/build.yml

@@ -76,20 +76,21 @@ jobs:
           - amd64
           - arm64v8
         build_type:
-          - gcc-debug-make
-          - gcc12-debug-ninja
-          - gcc12-release-ninja
-          - clang15-release-ninja
-          - clang15-release-ninja-static
+          - gcc-debug-ninja
+          - gcc-release-ninja
+          - oldgcc-debug-make
+          - clang-release-ninja
+          - clang-release-ninja-static
+          - oldclang-debug-make
         include:
           - arch: amd64
-            build_type: clang15-asan-ninja
+            build_type: clang-asan-ninja
           - arch: amd64
-            build_type: clang15-tsan-ninja
+            build_type: clang-tsan-ninja
           - arch: amd64
-            build_type: clang15-ubsan-ninja
+            build_type: clang-ubsan-ninja
           - arch: amd64
-            build_type: gcc12-debug-noperfmon-ninja
+            build_type: gcc-debug-noperfmon-ninja
 
     runs-on:
       - self-hosted

CMakeLists.txt

@@ -771,6 +771,7 @@ add_custom_command(
   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift/thrift/lib/thrift/frozen.thrift
               ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift/
   COMMAND ${CMAKE_CURRENT_BINARY_DIR}/bin/thrift1
+              -I ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift
               -o ${CMAKE_CURRENT_BINARY_DIR}/thrift/lib/thrift
               --gen mstch_cpp2
               frozen.thrift
@@ -792,6 +793,7 @@ add_custom_command(
   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/thrift/metadata.thrift
               ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs/metadata.thrift
   COMMAND ${CMAKE_CURRENT_BINARY_DIR}/bin/thrift1
+              -I ${CMAKE_CURRENT_SOURCE_DIR}/fbthrift
               -o ${CMAKE_CURRENT_BINARY_DIR}/thrift/dwarfs
               --gen mstch_cpp2:frozen2
               metadata.thrift

README.md

@@ -192,7 +192,7 @@ $ ln -s dwarfs-universal-0.7.0-Linux-aarch64 mkdwarfs
 $ ./mkdwarfs --help
 ```
 
-This also works on Windows ift the file system supports symbolic links:
+This also works on Windows if the file system supports symbolic links:
 
 ```
 > mklink mkdwarfs.exe dwarfs-universal-0.7.0-Windows-AMD64.exe
@@ -421,6 +421,12 @@ There are a few things worth pointing out, though:
   a DwarFS image that contains links of some sort, you might run into
   errors if you don't have the right privileges.
 
+- Due to a [problem](https://github.com/winfsp/winfsp/issues/454) in
+  WinFsp, symlinks cannot currently point outside of the mounted file
+  system.  Furthermore, due to another
+  [problem](https://github.com/winfsp/winfsp/issues/530) in WinFsp,
+  symlinks with a drive letter will appear with a mangled target path.
+
 - The DwarFS driver on Windows correctly reports hardlink counts via
   its API, but currently these counts are not correctly propagated
   to the Windows file system layer. This is presumably due to a

thrift/metadata.thrift

@@ -19,11 +19,16 @@
  * along with dwarfs.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+include "thrift/annotation/cpp.thrift"
+
 namespace cpp2 dwarfs.thrift.metadata
 
-typedef i16 (cpp2.type = "uint16_t") UInt16
-typedef i32 (cpp2.type = "uint32_t") UInt32
-typedef i64 (cpp2.type = "uint64_t") UInt64
+@cpp.Type{name = "uint16_t"}
+typedef i16 UInt16
+@cpp.Type{name = "uint32_t"}
+typedef i32 UInt32
+@cpp.Type{name = "uint64_t"}
+typedef i64 UInt64
 
 /**
  * One chunk of data