Remove macos clang11 from CI because it's broken

.github/workflows/main.yaml

@@ -127,7 +127,7 @@ jobs:
         run_tests: [true]
         run_clang_tidy: [false]
         exclude:
-          # MacOS CI doesn't have Clang 7, 8, 9, 10 or GCC 7, 8 anymore
+          # MacOS CI doesn't have Clang 7, 8, 9, 10, 11 or GCC 7, 8 anymore
           - os: macos-11
             compiler: {cxx: clang++-7, cc: clang-7, macos_cxx: /usr/local/opt/llvm@7/bin/clang++, macos_cc: /usr/local/opt/llvm@7/bin/clang, apt_package: clang-7, homebrew_package: llvm@7}
           - os: macos-11
@@ -136,6 +136,8 @@ jobs:
             compiler: {cxx: clang++-9, cc: clang-9, macos_cxx: /usr/local/opt/llvm@9/bin/clang++, macos_cc: /usr/local/opt/llvm@9/bin/clang, apt_package: clang-9, homebrew_package: llvm@9}
           - os: macos-11
             compiler: {cxx: clang++-10, cc: clang-10, macos_cxx: /usr/local/opt/llvm@10/bin/clang++, macos_cc: /usr/local/opt/llvm@10/bin/clang, apt_package: clang-10, homebrew_package: llvm@10}
+          - os: macos-11
+            compiler: {cxx: clang++-11, cc: clang-11, macos_cxx: /usr/local/opt/llvm@11/bin/clang++, macos_cc: /usr/local/opt/llvm@11/bin/clang, apt_package: "clang-11 libomp5-11 libomp-11-dev", homebrew_package: llvm@11}
           - os: macos-11
             compiler: {cxx: g++-7, cc: gcc-7, macos_cxx: g++-7, macos_cc: gcc-7, homebrew_package: gcc@7, apt_package: g++-7}
           - os: macos-11
@@ -146,18 +148,24 @@ jobs:
             compiler: {cxx: clang++-8, cc: clang-8, macos_cxx: /usr/local/opt/llvm@8/bin/clang++, macos_cc: /usr/local/opt/llvm@8/bin/clang, apt_package: clang-8, homebrew_package: llvm@8}
           - os: macos-12
             compiler: {cxx: clang++-9, cc: clang-9, macos_cxx: /usr/local/opt/llvm@9/bin/clang++, macos_cc: /usr/local/opt/llvm@9/bin/clang, apt_package: clang-9, homebrew_package: llvm@9}
+          - os: macos-12
+            compiler: {cxx: clang++-10, cc: clang-10, macos_cxx: /usr/local/opt/llvm@10/bin/clang++, macos_cc: /usr/local/opt/llvm@10/bin/clang, apt_package: clang-10, homebrew_package: llvm@10}
+          - os: macos-12
+            compiler: {cxx: clang++-11, cc: clang-11, macos_cxx: /usr/local/opt/llvm@11/bin/clang++, macos_cc: /usr/local/opt/llvm@11/bin/clang, apt_package: "clang-11 libomp5-11 libomp-11-dev", homebrew_package: llvm@11}
           - os: macos-12
             compiler: {cxx: g++-7, cc: gcc-7, macos_cxx: g++-7, macos_cc: gcc-7, homebrew_package: gcc@7, apt_package: g++-7}
           - os: macos-12
             compiler: {cxx: g++-8, cc: gcc-8, macos_cxx: g++-8, macos_cc: gcc-8, homebrew_package: gcc@8, apt_package: g++-8}
           - os: macos-12
             compiler: {cxx: g++-9, cc: gcc-9, macos_cxx: g++-9, macos_cc: gcc-9, homebrew_package: gcc@9, apt_package: g++-9}
-          - os: macos-12
-            compiler: {cxx: clang++-10, cc: clang-10, macos_cxx: /usr/local/opt/llvm@10/bin/clang++, macos_cc: /usr/local/opt/llvm@10/bin/clang, apt_package: clang-10, homebrew_package: llvm@10}
           - os: macos-13
             compiler: {cxx: clang++-7, cc: clang-7, macos_cxx: /usr/local/opt/llvm@7/bin/clang++, macos_cc: /usr/local/opt/llvm@7/bin/clang, apt_package: clang-7, homebrew_package: llvm@7}
+          - os: macos-13
+            compiler: {cxx: clang++-8, cc: clang-8, macos_cxx: /usr/local/opt/llvm@8/bin/clang++, macos_cc: /usr/local/opt/llvm@8/bin/clang, apt_package: clang-8, homebrew_package: llvm@8}
           - os: macos-13
             compiler: {cxx: clang++-10, cc: clang-10, macos_cxx: /usr/local/opt/llvm@10/bin/clang++, macos_cc: /usr/local/opt/llvm@10/bin/clang, apt_package: clang-10, homebrew_package: llvm@10}
+          - os: macos-13
+            compiler: {cxx: clang++-11, cc: clang-11, macos_cxx: /usr/local/opt/llvm@11/bin/clang++, macos_cc: /usr/local/opt/llvm@11/bin/clang, apt_package: "clang-11 libomp5-11 libomp-11-dev", homebrew_package: llvm@11}
           # Ubuntu 20.04 doesn't have GCC 12, 13 yet
           - os: ubuntu-20.04
             compiler: {cxx: g++-12, cc: gcc-12, macos_cxx: g++-12, macos_cc: gcc-12, homebrew_package: gcc@12, apt_package: g++-12}

ChangeLog.txt

@@ -1,3 +1,7 @@
+Version 0.11.5 (unreleased)
+---------------
+* Fix an issue when using `-o` atime mount options
+
 Version 0.11.4
 ---------------
 * Fixed build issue with GCC 13 (see https://github.com/cryfs/cryfs/pull/448 )

src/fspp/fuse/Fuse.cpp

@@ -338,12 +338,24 @@ void extractAllAtimeOptionsAndRemoveOnesUnknownToLibfuse_(string* csv_options, v
 vector<string> extractAllAtimeOptionsAndRemoveOnesUnknownToLibfuse_(vector<string>* fuseOptions) {
     vector<string> result;
     bool lastOptionWasDashO = false;
-    for (string& option : *fuseOptions) {
-        if (lastOptionWasDashO) {
-            extractAllAtimeOptionsAndRemoveOnesUnknownToLibfuse_(&option, &result);
+    for (size_t i = 0; i < fuseOptions->size(); ++i)
+    {
+      string &option = (*fuseOptions)[i];
+      if (lastOptionWasDashO)
+      {
+        extractAllAtimeOptionsAndRemoveOnesUnknownToLibfuse_(&option, &result);
+        if (option.empty()) {
+          // All options were removed, remove the empty argument
+          fuseOptions->erase(fuseOptions->begin() + i);
+          --i;
+          // And also remove the now value-less '-o' before it
+          fuseOptions->erase(fuseOptions->begin() + i);
+          --i;
         }
-        lastOptionWasDashO = (option == "-o");
+      }
+      lastOptionWasDashO = (option == "-o");
     }
+
     return result;
 }
 }