Merge pull request #33 from cryptomator/feature/enodata

Feature: Add error ENODATA for xattr support
cryptomator · Aug 30, 2023 · 901eb64 · 901eb64
2 parents 884ffd2 + 6f58712
commit 901eb64
Show file tree

Hide file tree

Showing 17 changed files with 108 additions and 7 deletions.
diff --git a/jfuse-api/src/main/java/org/cryptomator/jfuse/api/Errno.java b/jfuse-api/src/main/java/org/cryptomator/jfuse/api/Errno.java
@@ -124,4 +124,11 @@ public interface Errno {
  */
  int enametoolong();
 
+ /**
+ * The named attribute does not exist, or the process has no access to this attribute;
+ *
+ * @return error constant {@code ENODATA}
+ */
+ int enodata();
+
 }
diff --git a/jfuse-linux-aarch64/pom.xml b/jfuse-linux-aarch64/pom.xml
@@ -165,6 +165,7 @@
  <includeConstant>ERANGE</includeConstant>
  <includeConstant>ENOLCK</includeConstant>
  <includeConstant>ENAMETOOLONG</includeConstant>
+ <includeConstant>ENODATA</includeConstant>
  </includeConstants>
  </configuration>
  </execution>

diff --git a/jfuse-linux-aarch64/src/main/java/org/cryptomator/jfuse/linux/aarch64/LinuxErrno.java b/jfuse-linux-aarch64/src/main/java/org/cryptomator/jfuse/linux/aarch64/LinuxErrno.java
@@ -84,4 +84,9 @@ public int enolck() {
  public int enametoolong() {
  return errno_h.ENAMETOOLONG();
  }
+
+ @Override
+ public int enodata() {
+ return errno_h.ENODATA();
+ }
 }
diff --git a/...e-linux-aarch64/src/main/java/org/cryptomator/jfuse/linux/aarch64/extr/errno/errno_h.java b/...e-linux-aarch64/src/main/java/org/cryptomator/jfuse/linux/aarch64/extr/errno/errno_h.java
@@ -137,6 +137,14 @@ public static int ENOSYS() {
  public static int ENOTEMPTY() {
  return (int)39L;
  }
+ /**
+ * {@snippet :
+ * #define ENODATA 61
+ * }
+ */
+ public static int ENODATA() {
+ return (int)61L;
+ }
  /**
  * {@snippet :
  * #define ENOTSUP 95

diff --git a/jfuse-linux-aarch64/src/test/java/org/cryptomator/jfuse/linux/aarch64/LinuxErrnoTest.java b/jfuse-linux-aarch64/src/test/java/org/cryptomator/jfuse/linux/aarch64/LinuxErrnoTest.java
@@ -1,15 +1,21 @@
 package org.cryptomator.jfuse.linux.aarch64;
 
+import org.cryptomator.jfuse.api.Errno;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.jupiter.params.provider.ValueSource;
 
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.stream.Stream;
+
 public class LinuxErrnoTest {
 
  @DisplayName("make sure method is not a stub")
  @ParameterizedTest(name = "{0}()")
- @ValueSource(strings = {"enoent", "enosys", "enomem", "eacces", "eio", "erofs", "ebadf", "eexist", "enotdir", "eisdir", "enotempty", "einval"})
+ @MethodSource("errnoNameProvider")
  public void testErrnoIsNotZero(String methodName) throws ReflectiveOperationException {
  var errno = new LinuxErrno();
  var method = LinuxErrno.class.getMethod(methodName);
@@ -19,4 +25,8 @@ public void testErrnoIsNotZero(String methodName) throws ReflectiveOperationExce
  Assertions.assertNotEquals(0, result);
  }
 
+ static Stream<String> errnoNameProvider() {
+ return Arrays.stream(Errno.class.getDeclaredMethods()).map(Method::getName);
+ }
+
 }
diff --git a/jfuse-linux-amd64/pom.xml b/jfuse-linux-amd64/pom.xml
@@ -165,6 +165,7 @@
  <includeMacro>ERANGE</includeMacro>
  <includeMacro>ENOLCK</includeMacro>
  <includeMacro>ENAMETOOLONG</includeMacro>
+ <includeMacro>ENODATA</includeMacro>
  </includeConstants>
  </configuration>
  </execution>
@@ -231,5 +232,4 @@
  </build>
  </profile>
  </profiles>
-
-</project>
+</project>
diff --git a/jfuse-linux-amd64/src/main/java/org/cryptomator/jfuse/linux/amd64/LinuxErrno.java b/jfuse-linux-amd64/src/main/java/org/cryptomator/jfuse/linux/amd64/LinuxErrno.java
@@ -84,4 +84,9 @@ public int enolck() {
  public int enametoolong() {
  return errno_h.ENAMETOOLONG();
  }
+
+ @Override
+ public int enodata() {
+ return errno_h.ENODATA();
+ }
 }
diff --git a/jfuse-linux-amd64/src/main/java/org/cryptomator/jfuse/linux/amd64/extr/errno/errno_h.java b/jfuse-linux-amd64/src/main/java/org/cryptomator/jfuse/linux/amd64/extr/errno/errno_h.java
@@ -137,6 +137,14 @@ public static int ENOSYS() {
  public static int ENOTEMPTY() {
  return (int)39L;
  }
+ /**
+ * {@snippet :
+ * #define ENODATA 61
+ * }
+ */
+ public static int ENODATA() {
+ return (int)61L;
+ }
  /**
  * {@snippet :
  * #define ENOTSUP 95

diff --git a/jfuse-linux-amd64/src/test/java/org/cryptomator/jfuse/linux/amd64/LinuxErrnoTest.java b/jfuse-linux-amd64/src/test/java/org/cryptomator/jfuse/linux/amd64/LinuxErrnoTest.java
@@ -1,15 +1,21 @@
 package org.cryptomator.jfuse.linux.amd64;
 
+import org.cryptomator.jfuse.api.Errno;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.jupiter.params.provider.ValueSource;
 
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.stream.Stream;
+
 public class LinuxErrnoTest {
 
  @DisplayName("make sure method is not a stub")
  @ParameterizedTest(name = "{0}()")
- @ValueSource(strings = {"enoent", "enosys", "enomem", "eacces", "eio", "erofs", "ebadf", "eexist", "enotdir", "eisdir", "enotempty", "einval"})
+ @MethodSource("errnoNameProvider")
  public void testErrnoIsNotZero(String methodName) throws ReflectiveOperationException {
  var errno = new LinuxErrno();
  var method = LinuxErrno.class.getMethod(methodName);
@@ -19,4 +25,8 @@ public void testErrnoIsNotZero(String methodName) throws ReflectiveOperationExce
  Assertions.assertNotEquals(0, result);
  }
 
+ static Stream<String> errnoNameProvider() {
+ return Arrays.stream(Errno.class.getDeclaredMethods()).map(Method::getName);
+ }
+
 }
diff --git a/jfuse-mac/pom.xml b/jfuse-mac/pom.xml
@@ -139,6 +139,7 @@
  <includeConstant>ERANGE</includeConstant>
  <includeConstant>ENOLCK</includeConstant>
  <includeConstant>ENAMETOOLONG</includeConstant>
+ <includeConstant>ENODATA</includeConstant>
  </includeConstants>
  </configuration>
  </execution>

diff --git a/jfuse-mac/src/main/java/org/cryptomator/jfuse/mac/MacErrno.java b/jfuse-mac/src/main/java/org/cryptomator/jfuse/mac/MacErrno.java
@@ -84,4 +84,9 @@ public int enolck() {
  public int enametoolong() {
  return errno_h.ENAMETOOLONG();
  }
+
+ @Override
+ public int enodata() {
+ return errno_h.ENODATA();
+ }
 }
diff --git a/jfuse-mac/src/main/java/org/cryptomator/jfuse/mac/extr/errno/errno_h.java b/jfuse-mac/src/main/java/org/cryptomator/jfuse/mac/extr/errno/errno_h.java
@@ -145,6 +145,14 @@ public static int ENOLCK() {
  public static int ENOSYS() {
  return (int)78L;
  }
+ /**
+ * {@snippet :
+ * #define ENODATA 96
+ * }
+ */
+ public static int ENODATA() {
+ return (int)96L;
+ }
 }
 
 
diff --git a/jfuse-mac/src/test/java/org/cryptomator/jfuse/mac/MacErrnoTest.java b/jfuse-mac/src/test/java/org/cryptomator/jfuse/mac/MacErrnoTest.java
@@ -1,15 +1,20 @@
 package org.cryptomator.jfuse.mac;
 
+import org.cryptomator.jfuse.api.Errno;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.stream.Stream;
 
 public class MacErrnoTest {
 
  @DisplayName("make sure method is not a stub")
  @ParameterizedTest(name = "{0}()")
- @ValueSource(strings = {"enoent", "enosys", "enomem", "eacces", "eio", "erofs", "ebadf", "eexist", "enotdir", "eisdir", "enotempty", "einval"})
+ @MethodSource("errnoNameProvider")
  public void testErrnoIsNotZero(String methodName) throws ReflectiveOperationException {
  var errno = new MacErrno();
  var method = MacErrno.class.getMethod(methodName);
@@ -19,4 +24,8 @@ public void testErrnoIsNotZero(String methodName) throws ReflectiveOperationExce
  Assertions.assertNotEquals(0, result);
  }
 
+ static Stream<String> errnoNameProvider() {
+ return Arrays.stream(Errno.class.getDeclaredMethods()).map(Method::getName);
+ }
+
 }
diff --git a/jfuse-win/pom.xml b/jfuse-win/pom.xml
@@ -165,6 +165,7 @@
  <includeConstant>ERANGE</includeConstant>
  <includeConstant>ENOLCK</includeConstant>
  <includeConstant>ENAMETOOLONG</includeConstant>
+ <includeConstant>ENODATA</includeConstant>
  </includeConstants>
  </configuration>
  </execution>

diff --git a/jfuse-win/src/main/java/org/cryptomator/jfuse/win/WinErrno.java b/jfuse-win/src/main/java/org/cryptomator/jfuse/win/WinErrno.java
@@ -84,4 +84,9 @@ public int enolck() {
  public int enametoolong() {
  return errno_h.ENAMETOOLONG();
  }
+
+ @Override
+ public int enodata() {
+ return errno_h.ENODATA();
+ }
 }
diff --git a/jfuse-win/src/main/java/org/cryptomator/jfuse/win/extr/errno/errno_h.java b/jfuse-win/src/main/java/org/cryptomator/jfuse/win/extr/errno/errno_h.java
@@ -137,6 +137,14 @@ public static int EINVAL() {
  public static int ERANGE() {
  return (int)34L;
  }
+ /**
+ * {@snippet :
+ * #define ENODATA 120
+ * }
+ */
+ public static int ENODATA() {
+ return (int)120L;
+ }
  /**
  * {@snippet :
  * #define ENOTSUP 129

diff --git a/jfuse-win/src/test/java/org/cryptomator/jfuse/win/WinErrnoTest.java b/jfuse-win/src/test/java/org/cryptomator/jfuse/win/WinErrnoTest.java
@@ -1,15 +1,21 @@
 package org.cryptomator.jfuse.win;
 
+import org.cryptomator.jfuse.api.Errno;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.jupiter.params.provider.ValueSource;
 
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.stream.Stream;
+
 public class WinErrnoTest {
 
  @DisplayName("make sure method is not a stub")
  @ParameterizedTest(name = "{0}()")
- @ValueSource(strings = {"enoent", "enosys", "enomem", "eacces", "eio", "erofs", "ebadf", "eexist", "enotdir", "eisdir", "enotempty", "einval"})
+ @MethodSource("errnoNameProvider")
  public void testErrnoIsNotZero(String methodName) throws ReflectiveOperationException {
  var errno = new WinErrno();
  var method = WinErrno.class.getMethod(methodName);
@@ -19,4 +25,8 @@ public void testErrnoIsNotZero(String methodName) throws ReflectiveOperationExce
  Assertions.assertNotEquals(0, result);
  }
 
+ static Stream<String> errnoNameProvider() {
+ return Arrays.stream(Errno.class.getDeclaredMethods()).map(Method::getName);
+ }
+
 }