|
| 1 | +This patch reintroduces support for extended attributes in Solaris. |
| 2 | +It is subtly different from the support in JDK17 and earlier, in that |
| 3 | +attributes are implicitly namespaced, like Linux, as the code is now |
| 4 | +shared. This means that the 2 native attribute files you normally see |
| 5 | +are missing, and all the attribute filenames get a "user." prefix. |
| 6 | + |
| 7 | +--- a/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c Sat Oct 25 15:35:56 2025 |
| 8 | ++++ b/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c Wed Nov 12 14:16:06 2025 |
| 9 | +@@ -296,6 +296,106 @@ |
| 10 | + #endif |
| 11 | + |
| 12 | + /** |
| 13 | ++ * Solaris and illumos do not have the f*xattr set of functions, so |
| 14 | ++ * provide a reasonable facsimile here. |
| 15 | ++ */ |
| 16 | ++#ifdef __solaris__ |
| 17 | ++ssize_t sunos_flistxattr(int fd, char* list, size_t size) { |
| 18 | ++ int xfd = openat(fd, ".", O_RDONLY|O_XATTR); |
| 19 | ++ DIR *dirp = fdopendir(xfd); |
| 20 | ++ int ilist = 0; |
| 21 | ++ int ilen = 0; |
| 22 | ++ struct dirent *dp; |
| 23 | ++ while (dp = readdir(dirp)) { |
| 24 | ++ if (strcmp(dp->d_name, ".") && strcmp(dp->d_name, "..")) { |
| 25 | ++ ilen = strlen(dp->d_name); |
| 26 | ++ if (size == 0) { |
| 27 | ++ /* |
| 28 | ++ * size==0 means just return the total size. |
| 29 | ++ */ |
| 30 | ++ ilist += ilen; |
| 31 | ++ ilist += 1; |
| 32 | ++ } else { |
| 33 | ++ /* |
| 34 | ++ * If the name won't fit, break out and exit |
| 35 | ++ */ |
| 36 | ++ if (ilist + ilen + 1 > size) { |
| 37 | ++ ilist = -1; |
| 38 | ++ break; |
| 39 | ++ } |
| 40 | ++ memcpy(list + ilist, dp->d_name, ilen); |
| 41 | ++ ilist += ilen; |
| 42 | ++ list[ilist] = 0; |
| 43 | ++ ilist += 1; |
| 44 | ++ } |
| 45 | ++ } |
| 46 | ++ } |
| 47 | ++ closedir(dirp); |
| 48 | ++ close(xfd); |
| 49 | ++ /* |
| 50 | ++ * If the result won't fit, return -1 and set errno to ERANGE |
| 51 | ++ */ |
| 52 | ++ if (ilist == -1) |
| 53 | ++ errno = ERANGE; |
| 54 | ++ return ilist; |
| 55 | ++} |
| 56 | ++ssize_t sunos_fgetxattr(int fd, const char* name, void* value, size_t size) { |
| 57 | ++ int ifd = dup(fd); |
| 58 | ++ int gfd = openat(ifd, ".", O_RDONLY|O_XATTR); |
| 59 | ++ int rfd = openat(gfd, name, O_RDONLY); |
| 60 | ++ ssize_t nread; |
| 61 | ++ int xerr = 0; |
| 62 | ++ int nbuf[2]; |
| 63 | ++ /* |
| 64 | ++ * return size of entry and don't do the read if size passed as 0 |
| 65 | ++ */ |
| 66 | ++ if (size == 0) { |
| 67 | ++ struct stat lbuf; |
| 68 | ++ fstat(rfd, &lbuf); |
| 69 | ++ nread = (ssize_t) lbuf.st_size; |
| 70 | ++ } else { |
| 71 | ++ nread = read(rfd, value, size); |
| 72 | ++ if (nread > size) { |
| 73 | ++ nread = -1; |
| 74 | ++ xerr = -1; |
| 75 | ++ } |
| 76 | ++ /* |
| 77 | ++ * now we need to check if there's any more to read, and error |
| 78 | ++ * out if there is as the buffer we were given is too small. |
| 79 | ++ * if the buffer was exactly the right size this read will return zero |
| 80 | ++ */ |
| 81 | ++ if (nread == size) { |
| 82 | ++ if (read(rfd, &nbuf, 2) > 0) { |
| 83 | ++ nread = -1; |
| 84 | ++ xerr = -1; |
| 85 | ++ } |
| 86 | ++ } |
| 87 | ++ } |
| 88 | ++ close(rfd); |
| 89 | ++ close(gfd); |
| 90 | ++ close(ifd); |
| 91 | ++ if (xerr == -1) { |
| 92 | ++ errno = ERANGE; |
| 93 | ++ } |
| 94 | ++ return nread; |
| 95 | ++} |
| 96 | ++int sunos_fsetxattr(int fd, const char* name, void* value, size_t size) { |
| 97 | ++ int xfd = openat(fd, ".", O_RDONLY|O_XATTR); |
| 98 | ++ int wfd = openat(xfd, name, O_CREAT|O_RDWR, 0644); |
| 99 | ++ int uerr = write(wfd, value, size); |
| 100 | ++ close(wfd); |
| 101 | ++ close(xfd); |
| 102 | ++ return uerr; |
| 103 | ++} |
| 104 | ++int sunos_fremovexattr(int fd, const char* name) { |
| 105 | ++ int xfd = openat(fd, ".", O_RDONLY|O_XATTR); |
| 106 | ++ int uerr = unlinkat(xfd, name, 0); |
| 107 | ++ close(xfd); |
| 108 | ++ return uerr; |
| 109 | ++} |
| 110 | ++#endif |
| 111 | ++ |
| 112 | ++/** |
| 113 | + * Call this to throw an internal UnixException when a system/library |
| 114 | + * call fails |
| 115 | + */ |
| 116 | +@@ -1546,6 +1634,8 @@ |
| 117 | + res = fgetxattr(fd, name, value, valueLen); |
| 118 | + #elif defined(_ALLBSD_SOURCE) |
| 119 | + res = fgetxattr(fd, name, value, valueLen, 0, 0); |
| 120 | ++#elif defined(__solaris__) |
| 121 | ++ res = sunos_fgetxattr(fd, name, value, valueLen); |
| 122 | + #else |
| 123 | + throwUnixException(env, ENOTSUP); |
| 124 | + #endif |
| 125 | +@@ -1567,6 +1657,8 @@ |
| 126 | + res = fsetxattr(fd, name, value, valueLen, 0); |
| 127 | + #elif defined(_ALLBSD_SOURCE) |
| 128 | + res = fsetxattr(fd, name, value, valueLen, 0, 0); |
| 129 | ++#elif defined(__solaris__) |
| 130 | ++ res = sunos_fsetxattr(fd, name, value, valueLen); |
| 131 | + #else |
| 132 | + throwUnixException(env, ENOTSUP); |
| 133 | + #endif |
| 134 | +@@ -1586,6 +1678,8 @@ |
| 135 | + res = fremovexattr(fd, name); |
| 136 | + #elif defined(_ALLBSD_SOURCE) |
| 137 | + res = fremovexattr(fd, name, 0); |
| 138 | ++#elif defined(__solaris__) |
| 139 | ++ res = sunos_fremovexattr(fd, name); |
| 140 | + #else |
| 141 | + throwUnixException(env, ENOTSUP); |
| 142 | + #endif |
| 143 | +@@ -1605,6 +1699,8 @@ |
| 144 | + res = flistxattr(fd, list, (size_t)size); |
| 145 | + #elif defined(_ALLBSD_SOURCE) |
| 146 | + res = flistxattr(fd, list, (size_t)size, 0); |
| 147 | ++#elif defined(__solaris__) |
| 148 | ++ res = sunos_flistxattr(fd, list, (size_t)size); |
| 149 | + #else |
| 150 | + throwUnixException(env, ENOTSUP); |
| 151 | + #endif |
0 commit comments