archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8262742: (fs) Add Path::resolve with varargs string

Browse source 
Reviewed-by: alanb
This commit is contained in:
Brian Burkhalter 2023-07-24 19:59:17 +00:00
parent 8008e27c55
commit 2bdfa836ad
3 changed files with 239 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

77
src/java.base/unix/classes/sun/nio/fs/UnixPath.java
View file

@ -397,6 +397,83 @@ class UnixPath implements Path {
return resolve(new UnixPath(getFileSystem(), other));
}
private static final byte[] resolve(byte[] base, byte[]... children) {
// 'start' is either zero, indicating the base, or indicates which
// child is that last one which is an absolute path
int start = 0;
int resultLength = base.length;
// Locate the last child which is an absolute path and calculate
// the total number of bytes in the resolved path
final int count = children.length;
if (count > 0) {
for (int i = 0; i < count; i++) {
byte[] b = children[i];
if (b.length > 0) {
if (b[0] == '/') {
start = i + 1;
resultLength = b.length;
} else {
if (resultLength > 0)
resultLength++;
resultLength += b.length;
}
}
}
}
// If the base is not being superseded by a child which is an
// absolute path, then if at least one child is non-empty and
// the base consists only of a '/', then decrement resultLength to
// account for an extra '/' added in the resultLength computation.
if (start == 0 && resultLength > base.length && base.length == 1 && base[0] == '/')
resultLength--;
// Allocate the result array and return if empty.
byte[] result = new byte[resultLength];
if (result.length == 0)
return result;
// Prepend the base if it is non-empty and would not later be
// overwritten by an absolute child
int offset = 0;
if (start == 0 && base.length > 0) {
System.arraycopy(base, 0, result, 0, base.length);
offset += base.length;
}
// Append children starting with the last one which is an
// absolute path
if (count > 0) {
int idx = Math.max(0, start - 1);
for (int i = idx; i < count; i++) {
byte[] b = children[i];
if (b.length > 0) {
if (offset > 0 && result[offset - 1] != '/')
result[offset++] = '/';
System.arraycopy(b, 0, result, offset, b.length);
offset += b.length;
}
}
}
return result;
}
@Override
public UnixPath resolve(Path first, Path... more) {
if (more.length == 0)
return resolve(first);
byte[][] children = new byte[1 + more.length][];
children[0] = toUnixPath(first).path;
for (int i = 0; i < more.length; i++)
children[i + 1] = toUnixPath(more[i]).path;
byte[] result = resolve(path, children);
return new UnixPath(getFileSystem(), result);
}
@Override
public UnixPath relativize(Path obj) {
UnixPath child = toUnixPath(obj);