Merge branch 'release/1.1.1'

cryptomator · Feb 27, 2019 · 353dc96 · 353dc96
2 parents 4488ff3 + 25ebd15
commit 353dc96
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>fuse-nio-adapter</artifactId>
-	<version>1.1.0</version>
+	<version>1.1.1</version>
 	<name>FUSE-NIO-Adapter</name>
 	<description>Access resources at a given NIO path via FUSE.</description>
 	<url>https://github.com/cryptomator/fuse-nio-adapter</url>
@@ -15,7 +15,7 @@
 	</scm>
 
 	<properties>
-		<jnrfuse.version>0.5.2.1</jnrfuse.version>
+		<jnrfuse.version>0.5.3</jnrfuse.version>
 		<dagger.version>2.20</dagger.version>
 		<guava.version>27.0-jre</guava.version>
 		<slf4j.version>1.7.25</slf4j.version>

diff --git a/src/main/java/org/cryptomator/frontend/fuse/OpenOptionsUtil.java b/src/main/java/org/cryptomator/frontend/fuse/OpenOptionsUtil.java
@@ -21,16 +21,19 @@ public OpenOptionsUtil(BitMaskEnumUtil bitMaskUtil) {
 
 	public Set<OpenOption> fuseOpenFlagsToNioOpenOptions(long mask) {
 		Set<OpenFlags> flags = bitMaskUtil.bitMaskToSet(OpenFlags.class, mask);
-		return (fuseOpenFlagsToNioOpenOptions(flags));
+		return fuseOpenFlagsToNioOpenOptions(flags);
 	}
 
 	public Set<OpenOption> fuseOpenFlagsToNioOpenOptions(Set<OpenFlags> flags) {
 		Set<OpenOption> result = new HashSet<>();
-		if (flags.contains(OpenFlags.O_RDONLY) || flags.contains(OpenFlags.O_RDWR)) {
+		// https://linux.die.net/man/3/open:
+		if (flags.contains(OpenFlags.O_RDWR)) {
 			result.add(StandardOpenOption.READ);
-		}
-		if (flags.contains(OpenFlags.O_WRONLY) || flags.contains(OpenFlags.O_RDWR)) {
 			result.add(StandardOpenOption.WRITE);
+		} else if (flags.contains(OpenFlags.O_WRONLY)) {
+			result.add(StandardOpenOption.WRITE);
+		} else if (flags.contains(OpenFlags.O_RDONLY)) {
+			result.add(StandardOpenOption.READ);
 		}
 		if (flags.contains(OpenFlags.O_APPEND)) {
 			result.add(StandardOpenOption.APPEND);

diff --git a/src/test/java/org/cryptomator/frontend/fuse/OpenOptionsUtilTest.java b/src/test/java/org/cryptomator/frontend/fuse/OpenOptionsUtilTest.java
@@ -30,7 +30,9 @@ static Stream<Arguments> openOptionsProvider() {
 		return Stream.of( //
 				Arguments.of(Sets.newHashSet(StandardOpenOption.READ), EnumSet.of(OpenFlags.O_RDONLY)), //
 				Arguments.of(Sets.newHashSet(StandardOpenOption.WRITE), EnumSet.of(OpenFlags.O_WRONLY)), //
+				Arguments.of(Sets.newHashSet(StandardOpenOption.WRITE), EnumSet.of(OpenFlags.O_WRONLY, OpenFlags.O_RDONLY)), // write wins
 				Arguments.of(Sets.newHashSet(StandardOpenOption.READ, StandardOpenOption.WRITE), EnumSet.of(OpenFlags.O_RDWR)), //
+				Arguments.of(Sets.newHashSet(StandardOpenOption.READ, StandardOpenOption.WRITE), EnumSet.of(OpenFlags.O_RDWR, OpenFlags.O_WRONLY, OpenFlags.O_RDONLY)), //
 				Arguments.of(Sets.newHashSet(StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING), EnumSet.of(OpenFlags.O_WRONLY, OpenFlags.O_TRUNC)) //
 		);
 	}