Merge branch 'release/0.3.1'

cryptomator · Oct 26, 2022 · ca438bd · ca438bd
2 parents 24822b6 + d978cb2
commit ca438bd
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 5 deletions.
diff --git a/.idea/runConfigurations/PosixMirrorFileSystem__Linux_.xml b/.idea/runConfigurations/PosixMirrorFileSystem__Linux_.xml
diff --git a/.idea/runConfigurations/PosixMirrorFileSystem__fuse_t_.xml b/.idea/runConfigurations/PosixMirrorFileSystem__fuse_t_.xml
diff --git a/...nConfigurations/PosixMirrorFileSystem.xml → ...tions/PosixMirrorFileSystem__macFUSE_.xml b/...nConfigurations/PosixMirrorFileSystem.xml → ...tions/PosixMirrorFileSystem__macFUSE_.xml
diff --git a/jfuse-examples/src/main/java/org/cryptomator/jfuse/examples/AbstractMirrorFileSystem.java b/jfuse-examples/src/main/java/org/cryptomator/jfuse/examples/AbstractMirrorFileSystem.java
@@ -106,9 +106,7 @@ public Errno errno() {
 
 	@Override
 	public void init(FuseConnInfo conn, FuseConfig cfg) {
-		conn.setWant(conn.want() | FuseConnInfo.FUSE_CAP_BIG_WRITES);
-		conn.setMaxRead(Integer.MAX_VALUE);
-		conn.setMaxWrite(Integer.MAX_VALUE);
+		conn.setWant(conn.want() | (conn.capable() & FuseConnInfo.FUSE_CAP_BIG_WRITES));
 		conn.setMaxBackground(16);
 		conn.setCongestionThreshold(4);
 	}

diff --git a/jfuse-examples/src/main/java/org/cryptomator/jfuse/examples/PosixMirrorFileSystem.java b/jfuse-examples/src/main/java/org/cryptomator/jfuse/examples/PosixMirrorFileSystem.java
@@ -31,6 +31,10 @@ public static void main(String[] args) {
 		Path mirrored = Path.of(args[0]);
 		Path mountPoint = Path.of(args[1]);
 		var builder = Fuse.builder();
+		var libPath = System.getProperty("fuse.lib.path");
+		if (libPath != null && !libPath.isEmpty()) {
+			builder.setLibraryPath(libPath);
+		}
 		try (var fuse = builder.build(new PosixMirrorFileSystem(mirrored, builder.errno()))) {
 			LOG.info("Mounting at {}...", mountPoint);
 			fuse.mount("jfuse", mountPoint, "-s");