From f8e78e655de85a6a01b9ecd95cf14a2c031f19da Mon Sep 17 00:00:00 2001
From: Pablo Curiel <pabloacurielz@gmail.com>
Date: Sat, 25 Mar 2023 12:10:07 +0100
Subject: [PATCH] Update libusbhsfs

---
 .github/workflows/rewrite.yml | 17 +++++++++--------
 .gitignore                    |  1 +
 libs/libusbhsfs               |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/rewrite.yml b/.github/workflows/rewrite.yml
index 261d732..df13847 100644
--- a/.github/workflows/rewrite.yml
+++ b/.github/workflows/rewrite.yml
@@ -23,11 +23,12 @@ jobs:
         run: |
           sudo -n apt-get update
           sudo -n apt-get upgrade -y patch autoconf automake tar bzip2 diffutils pkgconf fakeroot p7zip-full git
-          sudo -n dkp-pacman --noconfirm -U "https://wii.leseratte10.de/devkitPro/switch/switch-libjson-c-0.16-1-any.pkg.tar.xz"
-          sudo -n dkp-pacman --noconfirm -U "https://wii.leseratte10.de/devkitPro/switch/switch-libpng-1.6.39-1-any.pkg.tar.xz"
-          sudo -n dkp-pacman --noconfirm -U "https://wii.leseratte10.de/devkitPro/switch/switch-zlib-1.2.13-1-any.pkg.tar.xz"
-          sudo -n dkp-pacman --noconfirm -U "https://wii.leseratte10.de/devkitPro/other-stuff/dkp-toolchain-vars-1.0.2-1-any.pkg.tar.xz"
-          sudo -n dkp-pacman --noconfirm -U "https://wii.leseratte10.de/devkitPro/cmake/switch-cmake-1.5.0-1-any.pkg.tar.xz"
+          sudo -n dkp-pacman --noconfirm -U \
+            "https://wii.leseratte10.de/devkitPro/switch/switch-libjson-c-0.16-1-any.pkg.tar.xz" \
+            "https://wii.leseratte10.de/devkitPro/switch/switch-libpng-1.6.39-1-any.pkg.tar.xz" \
+            "https://wii.leseratte10.de/devkitPro/switch/switch-zlib-1.2.13-1-any.pkg.tar.xz" \
+            "https://wii.leseratte10.de/devkitPro/other-stuff/dkp-toolchain-vars-1.0.2-1-any.pkg.tar.xz" \
+            "https://wii.leseratte10.de/devkitPro/cmake/switch-cmake-1.5.0-1-any.pkg.tar.xz"
 
       - name: Silence all git safe directory warnings
         run: git config --global --add safe.directory '*'
@@ -49,12 +50,12 @@ jobs:
       - name: Build and install libnx
         run: |
           cd "$GITHUB_WORKSPACE/libnx"
-          sudo --preserve-env=DEVKITPRO,DEVKITARM,DEVKITPPC -n make install -j$(nproc)
+          make install -j$(nproc)
 
       - name: Build libusbhsfs dependencies
         run: |
           cd "$GITHUB_WORKSPACE/nxdumptool/libs/libusbhsfs"
-          sudo --preserve-env=DEVKITPRO,DEVKITARM,DEVKITPPC -n make fs-libs -j$(nproc)
+          make fs-libs -j$(nproc)
 
       - name: Build nxdumptool-rewrite PoC binaries
         run: |
@@ -65,7 +66,7 @@ jobs:
       - name: Build nxdumptool-rewrite GUI binary
         run: |
           cd "$GITHUB_WORKSPACE/nxdumptool"
-          sudo --preserve-env=DEVKITPRO,DEVKITARM,DEVKITPPC -n make -j$(nproc)
+          make -j$(nproc)
 
       - uses: actions/upload-artifact@v3
         with:
diff --git a/.gitignore b/.gitignore
index 68145d9..8b2f17d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@ host/nxdumptool
 *.log
 *.spec
 *.exe
+*.code-workspace
 
 # TODO: remove these entries when we're done using PoCs.
 main.cpp
diff --git a/libs/libusbhsfs b/libs/libusbhsfs
index d6a4f38..68da930 160000
--- a/libs/libusbhsfs
+++ b/libs/libusbhsfs
@@ -1 +1 @@
-Subproject commit d6a4f38784e1ddf5d1d8fa4805f7789050b60f93
+Subproject commit 68da93049d85e890c7388f4fc14805dedf55af94