Merge branch 'release/0.6.1'

cryptomator · Sep 5, 2023 · ea3ec46 · ea3ec46
2 parents cf6c755 + 2837d56
commit ea3ec46
Show file tree

Hide file tree

Showing 18 changed files with 157 additions and 40 deletions.
diff --git a/jfuse-api/pom.xml b/jfuse-api/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>jfuse-parent</artifactId>
-		<version>0.6.0</version>
+		<version>0.6.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jfuse-api</artifactId>

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
@@ -131,4 +131,18 @@ public interface Errno {
 	 */
 	int enodata();
 
+	/**
+	 * The named attribute does not exist, or the process has no access to this attribute;
+	 *
+	 * @return error constant {@code ENOATTR}
+	 */
+	int enoattr();
+
+	/**
+	 * Argument list too long
+	 *
+	 * @return error constant {@code E2BIG}
+	 */
+	int e2big();
+
 }
diff --git a/jfuse-examples/pom.xml b/jfuse-examples/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>jfuse-parent</artifactId>
-		<version>0.6.0</version>
+		<version>0.6.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jfuse-examples</artifactId>

diff --git a/jfuse-linux-aarch64/pom.xml b/jfuse-linux-aarch64/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>jfuse-parent</artifactId>
 		<groupId>org.cryptomator</groupId>
-		<version>0.6.0</version>
+		<version>0.6.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jfuse-linux-aarch64</artifactId>
@@ -166,6 +166,7 @@
 										<includeConstant>ENOLCK</includeConstant>
 										<includeConstant>ENAMETOOLONG</includeConstant>
 										<includeConstant>ENODATA</includeConstant>
+										<includeConstant>E2BIG</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
@@ -89,4 +89,20 @@ public int enametoolong() {
 	public int enodata() {
 		return errno_h.ENODATA();
 	}
+
+	/**
+	 * Alias for {@link #enodata()}
+	 * @return error constant ENODATA
+	 * @deprecated Use {@link #enodata()} instead
+	 */
+	@Override
+	@Deprecated
+	public int enoattr() {
+		return enodata();
+	}
+
+	@Override
+	public int e2big() {
+		return errno_h.E2BIG();
+	}
 }
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
@@ -33,6 +33,14 @@ public static int ENOENT() {
     public static int EIO() {
         return (int)5L;
     }
+    /**
+     * {@snippet :
+     * #define E2BIG 7
+     * }
+     */
+    public static int E2BIG() {
+        return (int)7L;
+    }
     /**
      * {@snippet :
      * #define EBADF 9

diff --git a/jfuse-linux-amd64/pom.xml b/jfuse-linux-amd64/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>jfuse-parent</artifactId>
-		<version>0.6.0</version>
+		<version>0.6.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jfuse-linux-amd64</artifactId>
@@ -149,23 +149,24 @@
 									<targetPackage>org.cryptomator.jfuse.linux.amd64.extr.errno</targetPackage>
 									<headerClassName>errno_h</headerClassName>
 									<includeConstants>
-										<includeMacro>ENOENT</includeMacro>
-										<includeMacro>ENOSYS</includeMacro>
-										<includeMacro>ENOMEM</includeMacro>
-										<includeMacro>EACCES</includeMacro>
-										<includeMacro>EIO</includeMacro>
-										<includeMacro>EROFS</includeMacro>
-										<includeMacro>EBADF</includeMacro>
-										<includeMacro>EEXIST</includeMacro>
-										<includeMacro>ENOTDIR</includeMacro>
-										<includeMacro>EISDIR</includeMacro>
-										<includeMacro>ENOTEMPTY</includeMacro>
-										<includeMacro>ENOTSUP</includeMacro>
-										<includeMacro>EINVAL</includeMacro>
-										<includeMacro>ERANGE</includeMacro>
-										<includeMacro>ENOLCK</includeMacro>
-										<includeMacro>ENAMETOOLONG</includeMacro>
-										<includeMacro>ENODATA</includeMacro>
+										<includeConstant>ENOENT</includeConstant>
+										<includeConstant>ENOSYS</includeConstant>
+										<includeConstant>ENOMEM</includeConstant>
+										<includeConstant>EACCES</includeConstant>
+										<includeConstant>EIO</includeConstant>
+										<includeConstant>EROFS</includeConstant>
+										<includeConstant>EBADF</includeConstant>
+										<includeConstant>EEXIST</includeConstant>
+										<includeConstant>ENOTDIR</includeConstant>
+										<includeConstant>EISDIR</includeConstant>
+										<includeConstant>ENOTEMPTY</includeConstant>
+										<includeConstant>ENOTSUP</includeConstant>
+										<includeConstant>EINVAL</includeConstant>
+										<includeConstant>ERANGE</includeConstant>
+										<includeConstant>ENOLCK</includeConstant>
+										<includeConstant>ENAMETOOLONG</includeConstant>
+										<includeConstant>ENODATA</includeConstant>
+										<includeConstant>E2BIG</includeConstant>
 									</includeConstants>
 								</configuration>
 							</execution>
@@ -179,8 +180,8 @@
 									<targetPackage>org.cryptomator.jfuse.linux.amd64.extr.stat</targetPackage>
 									<headerClassName>stat_h</headerClassName>
 									<includeConstants>
-										<includeMacro>UTIME_NOW</includeMacro>
-										<includeMacro>UTIME_OMIT</includeMacro>
+										<includeConstant>UTIME_NOW</includeConstant>
+										<includeConstant>UTIME_OMIT</includeConstant>
 									</includeConstants>
 								</configuration>
 							</execution>
@@ -194,15 +195,15 @@
 									<headerClassName>fcntl_h</headerClassName>
 									<targetPackage>org.cryptomator.jfuse.linux.amd64.extr.fcntl</targetPackage>
 									<includeConstants>
-										<includeMacro>O_RDONLY</includeMacro>
-										<includeMacro>O_WRONLY</includeMacro>
-										<includeMacro>O_RDWR</includeMacro>
-										<includeMacro>O_APPEND</includeMacro>
-										<includeMacro>O_CREAT</includeMacro>
-										<includeMacro>O_TRUNC</includeMacro>
-										<includeMacro>O_EXCL</includeMacro>
-										<includeMacro>O_DSYNC</includeMacro>
-										<includeMacro>O_SYNC</includeMacro>
+										<includeConstant>O_RDONLY</includeConstant>
+										<includeConstant>O_WRONLY</includeConstant>
+										<includeConstant>O_RDWR</includeConstant>
+										<includeConstant>O_APPEND</includeConstant>
+										<includeConstant>O_CREAT</includeConstant>
+										<includeConstant>O_TRUNC</includeConstant>
+										<includeConstant>O_EXCL</includeConstant>
+										<includeConstant>O_DSYNC</includeConstant>
+										<includeConstant>O_SYNC</includeConstant>
 									</includeConstants>
 								</configuration>
 							</execution>
@@ -220,9 +221,9 @@
 									</cPreprocessorMacros>
 									<includeConstants>
 										<!-- GNU-specific flags for rename: -->
-										<includeMacro>RENAME_NOREPLACE</includeMacro>
-										<includeMacro>RENAME_EXCHANGE</includeMacro>
-										<includeMacro>RENAME_WHITEOUT</includeMacro>
+										<includeConstant>RENAME_NOREPLACE</includeConstant>
+										<includeConstant>RENAME_EXCHANGE</includeConstant>
+										<includeConstant>RENAME_WHITEOUT</includeConstant>
 									</includeConstants>
 								</configuration>
 							</execution>

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
@@ -89,4 +89,20 @@ public int enametoolong() {
 	public int enodata() {
 		return errno_h.ENODATA();
 	}
+
+	/**
+	 * Alias for {@link #enodata()}
+	 * @return error constant ENODATA
+	 * @deprecated Use {@link #enodata()} instead
+	 */
+	@Override
+	@Deprecated
+	public int enoattr() {
+		return enodata();
+	}
+
+	@Override
+	public int e2big() {
+		return errno_h.E2BIG();
+	}
 }
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
@@ -33,6 +33,14 @@ public static int ENOENT() {
     public static int EIO() {
         return (int)5L;
     }
+    /**
+     * {@snippet :
+     * #define E2BIG 7
+     * }
+     */
+    public static int E2BIG() {
+        return (int)7L;
+    }
     /**
      * {@snippet :
      * #define EBADF 9

diff --git a/jfuse-mac/pom.xml b/jfuse-mac/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>jfuse-parent</artifactId>
-		<version>0.6.0</version>
+		<version>0.6.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jfuse-mac</artifactId>
@@ -140,6 +140,8 @@
 										<includeConstant>ENOLCK</includeConstant>
 										<includeConstant>ENAMETOOLONG</includeConstant>
 										<includeConstant>ENODATA</includeConstant>
+										<includeConstant>ENOATTR</includeConstant>
+										<includeConstant>E2BIG</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
@@ -89,4 +89,14 @@ public int enametoolong() {
 	public int enodata() {
 		return errno_h.ENODATA();
 	}
+
+	@Override
+	public int enoattr() {
+		return errno_h.ENOATTR();
+	}
+
+	@Override
+	public int e2big() {
+		return errno_h.E2BIG();
+	}
 }
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
@@ -33,6 +33,14 @@ public static int ENOENT() {
     public static int EIO() {
         return (int)5L;
     }
+    /**
+     * {@snippet :
+     * #define E2BIG 7
+     * }
+     */
+    public static int E2BIG() {
+        return (int)7L;
+    }
     /**
      * {@snippet :
      * #define EBADF 9
@@ -145,6 +153,14 @@ public static int ENOLCK() {
     public static int ENOSYS() {
         return (int)78L;
     }
+    /**
+     * {@snippet :
+     * #define ENOATTR 93
+     * }
+     */
+    public static int ENOATTR() {
+        return (int)93L;
+    }
     /**
      * {@snippet :
      * #define ENODATA 96

diff --git a/jfuse-tests/pom.xml b/jfuse-tests/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>jfuse-parent</artifactId>
-		<version>0.6.0</version>
+		<version>0.6.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jfuse-tests</artifactId>

diff --git a/jfuse-win/pom.xml b/jfuse-win/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>jfuse-parent</artifactId>
-		<version>0.6.0</version>
+		<version>0.6.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jfuse-win</artifactId>
@@ -166,6 +166,7 @@
 										<includeConstant>ENOLCK</includeConstant>
 										<includeConstant>ENAMETOOLONG</includeConstant>
 										<includeConstant>ENODATA</includeConstant>
+										<includeConstant>E2BIG</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
@@ -89,4 +89,20 @@ public int enametoolong() {
 	public int enodata() {
 		return errno_h.ENODATA();
 	}
+
+	/**
+	 * Alias for {@link #enodata()}
+	 * @return error constant ENODATA
+	 * @deprecated Use {@link #enodata()} instead
+	 */
+	@Override
+	@Deprecated
+	public int enoattr() {
+		return enodata();
+	}
+
+	@Override
+	public int e2big() {
+		return errno_h.E2BIG();
+	}
 }
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
@@ -33,6 +33,14 @@ public static int ENOENT() {
     public static int EIO() {
         return (int)5L;
     }
+    /**
+     * {@snippet :
+     * #define E2BIG 7
+     * }
+     */
+    public static int E2BIG() {
+        return (int)7L;
+    }
     /**
      * {@snippet :
      * #define EBADF 9

diff --git a/jfuse/pom.xml b/jfuse/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>jfuse-parent</artifactId>
-		<version>0.6.0</version>
+		<version>0.6.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jfuse</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 	<groupId>org.cryptomator</groupId>
 	<artifactId>jfuse-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>0.6.0</version>
+	<version>0.6.1</version>
 	<name>jFUSE</name>
 	<description>Java bindings for FUSE using foreign functions &amp; memory API</description>
 	<url>https://github.com/cryptomator/jfuse</url>