Skip to content

Commit ea3ec46

Browse files
infeoinfeo
committed
Merge branch 'release/0.6.1'
2 parents cf6c755 + 2837d56 commit ea3ec46

File tree

18 files changed

+157
-40
lines changed

18 files changed

+157
-40
lines changed

‎jfuse-api/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.cryptomator</groupId>
77
<artifactId>jfuse-parent</artifactId>
8-
<version>0.6.0</version>
8+
<version>0.6.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>jfuse-api</artifactId>

‎jfuse-api/src/main/java/org/cryptomator/jfuse/api/Errno.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,4 +131,18 @@ public interface Errno {
131131
*/
132132
int enodata();
133133

134+
/**
135+
* The named attribute does not exist, or the process has no access to this attribute;
136+
*
137+
* @return error constant {@code ENOATTR}
138+
*/
139+
int enoattr();
140+
141+
/**
142+
* Argument list too long
143+
*
144+
* @return error constant {@code E2BIG}
145+
*/
146+
int e2big();
147+
134148
}

‎jfuse-examples/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.cryptomator</groupId>
77
<artifactId>jfuse-parent</artifactId>
8-
<version>0.6.0</version>
8+
<version>0.6.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>jfuse-examples</artifactId>

‎jfuse-linux-aarch64/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>jfuse-parent</artifactId>
77
<groupId>org.cryptomator</groupId>
8-
<version>0.6.0</version>
8+
<version>0.6.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>jfuse-linux-aarch64</artifactId>
@@ -166,6 +166,7 @@
166166
<includeConstant>ENOLCK</includeConstant>
167167
<includeConstant>ENAMETOOLONG</includeConstant>
168168
<includeConstant>ENODATA</includeConstant>
169+
<includeConstant>E2BIG</includeConstant>
169170
</includeConstants>
170171
</configuration>
171172
</execution>

‎jfuse-linux-aarch64/src/main/java/org/cryptomator/jfuse/linux/aarch64/LinuxErrno.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,20 @@ public int enametoolong() {
8989
public int enodata() {
9090
return errno_h.ENODATA();
9191
}
92+
93+
/**
94+
* Alias for {@link #enodata()}
95+
* @return error constant ENODATA
96+
* @deprecated Use {@link #enodata()} instead
97+
*/
98+
@Override
99+
@Deprecated
100+
public int enoattr() {
101+
return enodata();
102+
}
103+
104+
@Override
105+
public int e2big() {
106+
return errno_h.E2BIG();
107+
}
92108
}

‎jfuse-linux-aarch64/src/main/java/org/cryptomator/jfuse/linux/aarch64/extr/errno/errno_h.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@ public static int ENOENT() {
3333
public static int EIO() {
3434
return (int)5L;
3535
}
36+
/**
37+
* {@snippet :
38+
* #define E2BIG 7
39+
* }
40+
*/
41+
public static int E2BIG() {
42+
return (int)7L;
43+
}
3644
/**
3745
* {@snippet :
3846
* #define EBADF 9

‎jfuse-linux-amd64/pom.xml‎

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.cryptomator</groupId>
77
<artifactId>jfuse-parent</artifactId>
8-
<version>0.6.0</version>
8+
<version>0.6.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>jfuse-linux-amd64</artifactId>
@@ -149,23 +149,24 @@
149149
<targetPackage>org.cryptomator.jfuse.linux.amd64.extr.errno</targetPackage>
150150
<headerClassName>errno_h</headerClassName>
151151
<includeConstants>
152-
<includeMacro>ENOENT</includeMacro>
153-
<includeMacro>ENOSYS</includeMacro>
154-
<includeMacro>ENOMEM</includeMacro>
155-
<includeMacro>EACCES</includeMacro>
156-
<includeMacro>EIO</includeMacro>
157-
<includeMacro>EROFS</includeMacro>
158-
<includeMacro>EBADF</includeMacro>
159-
<includeMacro>EEXIST</includeMacro>
160-
<includeMacro>ENOTDIR</includeMacro>
161-
<includeMacro>EISDIR</includeMacro>
162-
<includeMacro>ENOTEMPTY</includeMacro>
163-
<includeMacro>ENOTSUP</includeMacro>
164-
<includeMacro>EINVAL</includeMacro>
165-
<includeMacro>ERANGE</includeMacro>
166-
<includeMacro>ENOLCK</includeMacro>
167-
<includeMacro>ENAMETOOLONG</includeMacro>
168-
<includeMacro>ENODATA</includeMacro>
152+
<includeConstant>ENOENT</includeConstant>
153+
<includeConstant>ENOSYS</includeConstant>
154+
<includeConstant>ENOMEM</includeConstant>
155+
<includeConstant>EACCES</includeConstant>
156+
<includeConstant>EIO</includeConstant>
157+
<includeConstant>EROFS</includeConstant>
158+
<includeConstant>EBADF</includeConstant>
159+
<includeConstant>EEXIST</includeConstant>
160+
<includeConstant>ENOTDIR</includeConstant>
161+
<includeConstant>EISDIR</includeConstant>
162+
<includeConstant>ENOTEMPTY</includeConstant>
163+
<includeConstant>ENOTSUP</includeConstant>
164+
<includeConstant>EINVAL</includeConstant>
165+
<includeConstant>ERANGE</includeConstant>
166+
<includeConstant>ENOLCK</includeConstant>
167+
<includeConstant>ENAMETOOLONG</includeConstant>
168+
<includeConstant>ENODATA</includeConstant>
169+
<includeConstant>E2BIG</includeConstant>
169170
</includeConstants>
170171
</configuration>
171172
</execution>
@@ -179,8 +180,8 @@
179180
<targetPackage>org.cryptomator.jfuse.linux.amd64.extr.stat</targetPackage>
180181
<headerClassName>stat_h</headerClassName>
181182
<includeConstants>
182-
<includeMacro>UTIME_NOW</includeMacro>
183-
<includeMacro>UTIME_OMIT</includeMacro>
183+
<includeConstant>UTIME_NOW</includeConstant>
184+
<includeConstant>UTIME_OMIT</includeConstant>
184185
</includeConstants>
185186
</configuration>
186187
</execution>
@@ -194,15 +195,15 @@
194195
<headerClassName>fcntl_h</headerClassName>
195196
<targetPackage>org.cryptomator.jfuse.linux.amd64.extr.fcntl</targetPackage>
196197
<includeConstants>
197-
<includeMacro>O_RDONLY</includeMacro>
198-
<includeMacro>O_WRONLY</includeMacro>
199-
<includeMacro>O_RDWR</includeMacro>
200-
<includeMacro>O_APPEND</includeMacro>
201-
<includeMacro>O_CREAT</includeMacro>
202-
<includeMacro>O_TRUNC</includeMacro>
203-
<includeMacro>O_EXCL</includeMacro>
204-
<includeMacro>O_DSYNC</includeMacro>
205-
<includeMacro>O_SYNC</includeMacro>
198+
<includeConstant>O_RDONLY</includeConstant>
199+
<includeConstant>O_WRONLY</includeConstant>
200+
<includeConstant>O_RDWR</includeConstant>
201+
<includeConstant>O_APPEND</includeConstant>
202+
<includeConstant>O_CREAT</includeConstant>
203+
<includeConstant>O_TRUNC</includeConstant>
204+
<includeConstant>O_EXCL</includeConstant>
205+
<includeConstant>O_DSYNC</includeConstant>
206+
<includeConstant>O_SYNC</includeConstant>
206207
</includeConstants>
207208
</configuration>
208209
</execution>
@@ -220,9 +221,9 @@
220221
</cPreprocessorMacros>
221222
<includeConstants>
222223
<!-- GNU-specific flags for rename: -->
223-
<includeMacro>RENAME_NOREPLACE</includeMacro>
224-
<includeMacro>RENAME_EXCHANGE</includeMacro>
225-
<includeMacro>RENAME_WHITEOUT</includeMacro>
224+
<includeConstant>RENAME_NOREPLACE</includeConstant>
225+
<includeConstant>RENAME_EXCHANGE</includeConstant>
226+
<includeConstant>RENAME_WHITEOUT</includeConstant>
226227
</includeConstants>
227228
</configuration>
228229
</execution>

‎jfuse-linux-amd64/src/main/java/org/cryptomator/jfuse/linux/amd64/LinuxErrno.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,20 @@ public int enametoolong() {
8989
public int enodata() {
9090
return errno_h.ENODATA();
9191
}
92+
93+
/**
94+
* Alias for {@link #enodata()}
95+
* @return error constant ENODATA
96+
* @deprecated Use {@link #enodata()} instead
97+
*/
98+
@Override
99+
@Deprecated
100+
public int enoattr() {
101+
return enodata();
102+
}
103+
104+
@Override
105+
public int e2big() {
106+
return errno_h.E2BIG();
107+
}
92108
}

‎jfuse-linux-amd64/src/main/java/org/cryptomator/jfuse/linux/amd64/extr/errno/errno_h.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@ public static int ENOENT() {
3333
public static int EIO() {
3434
return (int)5L;
3535
}
36+
/**
37+
* {@snippet :
38+
* #define E2BIG 7
39+
* }
40+
*/
41+
public static int E2BIG() {
42+
return (int)7L;
43+
}
3644
/**
3745
* {@snippet :
3846
* #define EBADF 9

‎jfuse-mac/pom.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.cryptomator</groupId>
77
<artifactId>jfuse-parent</artifactId>
8-
<version>0.6.0</version>
8+
<version>0.6.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>jfuse-mac</artifactId>
@@ -140,6 +140,8 @@
140140
<includeConstant>ENOLCK</includeConstant>
141141
<includeConstant>ENAMETOOLONG</includeConstant>
142142
<includeConstant>ENODATA</includeConstant>
143+
<includeConstant>ENOATTR</includeConstant>
144+
<includeConstant>E2BIG</includeConstant>
143145
</includeConstants>
144146
</configuration>
145147
</execution>

0 commit comments

Comments
 (0)